Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions builds/gnu/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@ include_bitcoin_database_impl_primitivesdir = \
include_bitcoin_database_impl_primitives_HEADERS = \
${srcdir}/../../include/bitcoin/database/impl/primitives/arrayhead.ipp \
${srcdir}/../../include/bitcoin/database/impl/primitives/arraymap.ipp \
${srcdir}/../../include/bitcoin/database/impl/primitives/body.ipp \
${srcdir}/../../include/bitcoin/database/impl/primitives/hashhead.ipp \
${srcdir}/../../include/bitcoin/database/impl/primitives/hashmap.ipp \
${srcdir}/../../include/bitcoin/database/impl/primitives/iterator.ipp \
${srcdir}/../../include/bitcoin/database/impl/primitives/keys.ipp \
${srcdir}/../../include/bitcoin/database/impl/primitives/linkage.ipp \
${srcdir}/../../include/bitcoin/database/impl/primitives/manager.ipp \
${srcdir}/../../include/bitcoin/database/impl/primitives/nohead.ipp \
${srcdir}/../../include/bitcoin/database/impl/primitives/nomap.ipp \
${srcdir}/../../include/bitcoin/database/impl/primitives/nomaps.ipp
Expand Down Expand Up @@ -238,13 +238,13 @@ include_bitcoin_database_primitivesdir = \
include_bitcoin_database_primitives_HEADERS = \
${srcdir}/../../include/bitcoin/database/primitives/arrayhead.hpp \
${srcdir}/../../include/bitcoin/database/primitives/arraymap.hpp \
${srcdir}/../../include/bitcoin/database/primitives/body.hpp \
${srcdir}/../../include/bitcoin/database/primitives/column.hpp \
${srcdir}/../../include/bitcoin/database/primitives/hashhead.hpp \
${srcdir}/../../include/bitcoin/database/primitives/hashmap.hpp \
${srcdir}/../../include/bitcoin/database/primitives/iterator.hpp \
${srcdir}/../../include/bitcoin/database/primitives/keys.hpp \
${srcdir}/../../include/bitcoin/database/primitives/linkage.hpp \
${srcdir}/../../include/bitcoin/database/primitives/manager.hpp \
${srcdir}/../../include/bitcoin/database/primitives/nohead.hpp \
${srcdir}/../../include/bitcoin/database/primitives/nomap.hpp \
${srcdir}/../../include/bitcoin/database/primitives/nomaps.hpp \
Expand Down Expand Up @@ -361,12 +361,12 @@ test_libbitcoin_database_test_SOURCES = \
${srcdir}/../../test/mocks/blocks.cpp \
${srcdir}/../../test/primitives/arrayhead.cpp \
${srcdir}/../../test/primitives/arraymap.cpp \
${srcdir}/../../test/primitives/body.cpp \
${srcdir}/../../test/primitives/hashhead.cpp \
${srcdir}/../../test/primitives/hashmap.cpp \
${srcdir}/../../test/primitives/iterator.cpp \
${srcdir}/../../test/primitives/keys.cpp \
${srcdir}/../../test/primitives/linkage.cpp \
${srcdir}/../../test/primitives/manager.cpp \
${srcdir}/../../test/primitives/nohead.cpp \
${srcdir}/../../test/primitives/nomap.cpp \
${srcdir}/../../test/query/amounts.cpp \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,12 @@
<ClCompile Include="..\..\..\..\test\mocks\blocks.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\arrayhead.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\arraymap.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\body.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\hashhead.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\hashmap.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\iterator.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\keys.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\linkage.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\manager.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\nohead.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\nomap.cpp" />
<ClCompile Include="..\..\..\..\test\query\address\address_balance.cpp" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@
<ClCompile Include="..\..\..\..\test\primitives\arraymap.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\primitives\body.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\primitives\hashhead.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
Expand All @@ -120,9 +123,6 @@
<ClCompile Include="..\..\..\..\test\primitives\linkage.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\primitives\manager.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\primitives\nohead.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,13 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\utilities.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arrayhead.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arraymap.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\body.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\column.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashhead.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\iterator.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\keys.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\linkage.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\manager.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\nohead.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\nomap.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\nomaps.hpp" />
Expand Down Expand Up @@ -227,12 +227,12 @@
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\mmap_storage.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\arrayhead.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\arraymap.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\body.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashhead.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\iterator.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\keys.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\linkage.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\manager.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\nohead.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\nomap.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\nomaps.ipp" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,9 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arraymap.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\body.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\column.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
Expand All @@ -224,9 +227,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\linkage.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\manager.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\nohead.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
Expand Down Expand Up @@ -394,6 +394,9 @@
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\arraymap.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\body.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashhead.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
Expand All @@ -409,9 +412,6 @@
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\linkage.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\manager.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\nohead.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,12 @@
<ClCompile Include="..\..\..\..\test\mocks\blocks.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\arrayhead.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\arraymap.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\body.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\hashhead.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\hashmap.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\iterator.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\keys.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\linkage.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\manager.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\nohead.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\nomap.cpp" />
<ClCompile Include="..\..\..\..\test\query\address\address_balance.cpp" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@
<ClCompile Include="..\..\..\..\test\primitives\arraymap.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\primitives\body.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\primitives\hashhead.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
Expand All @@ -120,9 +123,6 @@
<ClCompile Include="..\..\..\..\test\primitives\linkage.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\primitives\manager.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\primitives\nohead.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,13 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\utilities.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arrayhead.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arraymap.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\body.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\column.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashhead.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\iterator.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\keys.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\linkage.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\manager.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\nohead.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\nomap.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\nomaps.hpp" />
Expand Down Expand Up @@ -227,12 +227,12 @@
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\mmap_storage.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\arrayhead.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\arraymap.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\body.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashhead.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\iterator.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\keys.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\linkage.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\manager.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\nohead.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\nomap.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\nomaps.ipp" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,9 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arraymap.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\body.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\column.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
Expand All @@ -224,9 +227,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\linkage.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\manager.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\nohead.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
Expand Down Expand Up @@ -394,6 +394,9 @@
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\arraymap.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\body.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashhead.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
Expand All @@ -409,9 +412,6 @@
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\linkage.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\manager.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\nohead.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
Expand Down
2 changes: 1 addition & 1 deletion include/bitcoin/database.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@
#include <bitcoin/database/memory/interfaces/storage.hpp>
#include <bitcoin/database/primitives/arrayhead.hpp>
#include <bitcoin/database/primitives/arraymap.hpp>
#include <bitcoin/database/primitives/body.hpp>
#include <bitcoin/database/primitives/column.hpp>
#include <bitcoin/database/primitives/hashhead.hpp>
#include <bitcoin/database/primitives/hashmap.hpp>
#include <bitcoin/database/primitives/iterator.hpp>
#include <bitcoin/database/primitives/keys.hpp>
#include <bitcoin/database/primitives/linkage.hpp>
#include <bitcoin/database/primitives/manager.hpp>
#include <bitcoin/database/primitives/nohead.hpp>
#include <bitcoin/database/primitives/nomap.hpp>
#include <bitcoin/database/primitives/nomaps.hpp>
Expand Down
52 changes: 13 additions & 39 deletions include/bitcoin/database/impl/memory/mmap_dispatch.ipp
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,10 @@ namespace database {
// ----------------------------------------------------------------------------

TEMPLATE
memory_ptr CLASS::set(size_t offset, size_t size, uint8_t backfill) NOEXCEPT
memory CLASS::get_filled(size_t offset, size_t size,
uint8_t backfill) NOEXCEPT
{
// This is basically allocate(...) for application to a table head.
// This is basically allocate(...), backfilled for use with a table head.
{
std::unique_lock field_lock(field_mutex_);

Expand Down Expand Up @@ -70,28 +71,29 @@ memory_ptr CLASS::set(size_t offset, size_t size, uint8_t backfill) NOEXCEPT
}

TEMPLATE
memory_ptr CLASS::get_capacity(size_t offset) const NOEXCEPT
memory CLASS::get_capacity(size_t offset) const NOEXCEPT
{
const auto allocated = to_width<zero>(capacity());

const auto ptr = std::make_shared<accessor>(remap_mutex_);
if (!loaded_ || is_null(ptr))
memory out{ remap_mutex_ };

if (!loaded_)
return {};

auto data = memory_map_.front();
ptr->assign(std::next(data, offset), std::next(data, allocated));
return ptr;
out.assign(std::next(data, offset), std::next(data, allocated));
return out;
}

TEMPLATE
memory::iterator CLASS::get_raw(size_t offset) const NOEXCEPT
{
// Pointer otherwise unguarded, not remap safe (use for fixed table heads).
return get_at_raw(zero, offset);
return get_raw_at(zero, offset);
}

TEMPLATE
memory::iterator CLASS::get_at_raw(size_t column, size_t offset) const NOEXCEPT
memory::iterator CLASS::get_raw_at(size_t column, size_t offset) const NOEXCEPT
{
// get_raw not used for variably-sized heads, so should always be bounded.
BC_ASSERT(offset < (size() * widths.at(column)));
Expand All @@ -101,41 +103,13 @@ memory::iterator CLASS::get_at_raw(size_t column, size_t offset) const NOEXCEPT
}

TEMPLATE
memory_ptr CLASS::get(size_t offset) const NOEXCEPT
memory CLASS::get(size_t offset) const NOEXCEPT
{
return get_at(zero, offset);
}

TEMPLATE
memory_ptr CLASS::get_at(size_t column, size_t offset) const NOEXCEPT
{
if (column >= columns)
return {};

// Obtaining size before access prevents mutual mutex wait (deadlock).
const auto allocated = size() * widths.at(column);

// Takes a shared lock on remap_mutex_ until destruct, blocking remap.
const auto ptr = std::make_shared<accessor>(remap_mutex_);

// loaded_ update is precluded by above lock, making this read atomic.
if (!loaded_ || is_null(ptr))
return {};

// With offset > size the assignment is negative (stream is exhausted).
auto data = memory_map_.at(column);
ptr->assign(std::next(data, offset), std::next(data, allocated));
return ptr;
}

TEMPLATE
memory CLASS::get1(size_t offset) const NOEXCEPT
{
return get_at1(zero, offset);
}

TEMPLATE
memory CLASS::get_at1(size_t column, size_t offset) const NOEXCEPT
memory CLASS::get_at(size_t column, size_t offset) const NOEXCEPT
{
if (column >= columns)
return {};
Expand Down
2 changes: 1 addition & 1 deletion include/bitcoin/database/impl/memory/mmap_storage.ipp
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ code CLASS::dump(const std::filesystem::path& path) const NOEXCEPT
if (!ptr)
return error::unloaded_file;

return file::create_file_ex(path, ptr->begin(), ptr->size());
return file::create_file_ex(path, ptr.begin(), ptr.size());
}

// ----------------------------------------------------------------------------
Expand Down
Loading
Loading