Skip to content

Aggregate batch column writes under one remap guard. #857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evoskuil merged 8 commits into from
Jul 14, 2026
Merged

Aggregate batch column writes under one remap guard. #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f68d36b
Make accessor non-templated (always shared_mutex).
evoskuil Jul 13, 2026
d9f1fad
Drop memory interface into concrete type.
evoskuil Jul 13, 2026
e19243a
Draft impl of no-alloc/interlock on nomaps table row writers.
evoskuil Jul 13, 2026
aebc465
Style.
evoskuil Jul 13, 2026
f893d49
Aggregate batch column writes under one remap guard.
evoskuil Jul 14, 2026
ca697d3
Style, sort methods.
evoskuil Jul 13, 2026
cdd18fb
DRY.
evoskuil Jul 14, 2026
e8b0b3a
Comments.
evoskuil Jul 14, 2026
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
16 changes: 9 additions & 7 deletions builds/cmake/install-cmake.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,21 +446,23 @@ main()
UltrafastSecp256k1_FLAGS=()

UltrafastSecp256k1_OPTIONS=(
"-DSECP256K1_BUILD_TESTS=OFF"
"-DSECP256K1_BUILD_BENCH=OFF"
"-DSECP256K1_BUILD_EXAMPLES=OFF"
"-DSECP256K1_BUILD_JAVA=OFF"
"-DUFSECP_BUILD_SHARED=OFF"
"-DSECP256K1_BUILD_CABI=ON"
"-DSECP256K1_BUILD_CPU=ON"
"-DSECP256K1_BUILD_SHIM=ON"
"-DSECP256K1_USE_ULTRAFAST=ON"
"-DSECP256K1_BUILD_CUDA=ON"
"-DSECP256K1_BUILD_ROCM=ON"
"-DSECP256K1_BUILD_OPENCL=ON"
"-DSECP256K1_BUILD_METAL=ON"
"-DSECP256K1_BUILD_BENCH=OFF"
"-DSECP256K1_BUILD_EXAMPLES=OFF"
"-DSECP256K1_BUILD_JAVA=OFF"
"-DSECP256K1_BUILD_TESTS=OFF"
"-DSECP256K1_SHIM_BUILD_SHARED=OFF"
"-DUFSECP_BUILD_SHARED=OFF"
"-DSECP256K1_INSTALL=ON"
"-DSECP256K1_INSTALL_PKGCONFIG=ON"
"-DSECP256K1_USE_ULTRAFAST=ON")
"-DSECP256K1_SHIM_INSTALL=ON"
"-DSECP256K1_INSTALL_PKGCONFIG=ON")

libbitcoin_system_FLAGS=()

Expand Down
16 changes: 9 additions & 7 deletions builds/cmake/install-presets.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,21 +462,23 @@ main()
UltrafastSecp256k1_FLAGS=()

UltrafastSecp256k1_OPTIONS=(
"-DSECP256K1_BUILD_TESTS=OFF"
"-DSECP256K1_BUILD_BENCH=OFF"
"-DSECP256K1_BUILD_EXAMPLES=OFF"
"-DSECP256K1_BUILD_JAVA=OFF"
"-DUFSECP_BUILD_SHARED=OFF"
"-DSECP256K1_BUILD_CABI=ON"
"-DSECP256K1_BUILD_CPU=ON"
"-DSECP256K1_BUILD_SHIM=ON"
"-DSECP256K1_USE_ULTRAFAST=ON"
"-DSECP256K1_BUILD_CUDA=ON"
"-DSECP256K1_BUILD_ROCM=ON"
"-DSECP256K1_BUILD_OPENCL=ON"
"-DSECP256K1_BUILD_METAL=ON"
"-DSECP256K1_BUILD_BENCH=OFF"
"-DSECP256K1_BUILD_EXAMPLES=OFF"
"-DSECP256K1_BUILD_JAVA=OFF"
"-DSECP256K1_BUILD_TESTS=OFF"
"-DSECP256K1_SHIM_BUILD_SHARED=OFF"
"-DUFSECP_BUILD_SHARED=OFF"
"-DSECP256K1_INSTALL=ON"
"-DSECP256K1_INSTALL_PKGCONFIG=ON"
"-DSECP256K1_USE_ULTRAFAST=ON")
"-DSECP256K1_SHIM_INSTALL=ON"
"-DSECP256K1_INSTALL_PKGCONFIG=ON")

libbitcoin_system_FLAGS=()

Expand Down
2 changes: 0 additions & 2 deletions builds/gnu/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ include_bitcoin_database_impl_memorydir = \
${includedir}/bitcoin/database/impl/memory

include_bitcoin_database_impl_memory_HEADERS = \
${srcdir}/../../include/bitcoin/database/impl/memory/accessor.ipp \
${srcdir}/../../include/bitcoin/database/impl/memory/mmap.ipp \
${srcdir}/../../include/bitcoin/database/impl/memory/mmap_dispatch.ipp \
${srcdir}/../../include/bitcoin/database/impl/memory/mmap_private.ipp \
Expand Down Expand Up @@ -231,7 +230,6 @@ include_bitcoin_database_memory_interfacesdir = \
${includedir}/bitcoin/database/memory/interfaces

include_bitcoin_database_memory_interfaces_HEADERS = \
${srcdir}/../../include/bitcoin/database/memory/interfaces/memory.hpp \
${srcdir}/../../include/bitcoin/database/memory/interfaces/storage.hpp

include_bitcoin_database_primitivesdir = \
Expand Down
16 changes: 9 additions & 7 deletions builds/gnu/install-gnu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,21 +474,23 @@ main()
UltrafastSecp256k1_FLAGS=()

UltrafastSecp256k1_OPTIONS=(
"-DSECP256K1_BUILD_TESTS=OFF"
"-DSECP256K1_BUILD_BENCH=OFF"
"-DSECP256K1_BUILD_EXAMPLES=OFF"
"-DSECP256K1_BUILD_JAVA=OFF"
"-DUFSECP_BUILD_SHARED=OFF"
"-DSECP256K1_BUILD_CABI=ON"
"-DSECP256K1_BUILD_CPU=ON"
"-DSECP256K1_BUILD_SHIM=ON"
"-DSECP256K1_USE_ULTRAFAST=ON"
"-DSECP256K1_BUILD_CUDA=ON"
"-DSECP256K1_BUILD_ROCM=ON"
"-DSECP256K1_BUILD_OPENCL=ON"
"-DSECP256K1_BUILD_METAL=ON"
"-DSECP256K1_BUILD_BENCH=OFF"
"-DSECP256K1_BUILD_EXAMPLES=OFF"
"-DSECP256K1_BUILD_JAVA=OFF"
"-DSECP256K1_BUILD_TESTS=OFF"
"-DSECP256K1_SHIM_BUILD_SHARED=OFF"
"-DUFSECP_BUILD_SHARED=OFF"
"-DSECP256K1_INSTALL=ON"
"-DSECP256K1_INSTALL_PKGCONFIG=ON"
"-DSECP256K1_USE_ULTRAFAST=ON")
"-DSECP256K1_SHIM_INSTALL=ON"
"-DSECP256K1_INSTALL_PKGCONFIG=ON")

libbitcoin_system_FLAGS=()

Expand Down
2 changes: 0 additions & 2 deletions builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\locks\locks.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\accessor.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\finalizer.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\interfaces\memory.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\interfaces\storage.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\memory.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\mman.hpp" />
Expand Down Expand Up @@ -222,7 +221,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\version.hpp" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\accessor.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\mmap.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\mmap_dispatch.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\mmap_private.ipp" />
Expand Down
6 changes: 0 additions & 6 deletions builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\finalizer.hpp">
<Filter>include\bitcoin\database\memory</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\interfaces\memory.hpp">
<Filter>include\bitcoin\database\memory\interfaces</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\interfaces\storage.hpp">
<Filter>include\bitcoin\database\memory\interfaces</Filter>
</ClInclude>
Expand Down Expand Up @@ -379,9 +376,6 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\accessor.ipp">
<Filter>include\bitcoin\database\impl\memory</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\mmap.ipp">
<Filter>include\bitcoin\database\impl\memory</Filter>
</None>
Expand Down
2 changes: 0 additions & 2 deletions builds/msvc/vs2026/libbitcoin-database/libbitcoin-database.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\locks\locks.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\accessor.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\finalizer.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\interfaces\memory.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\interfaces\storage.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\memory.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\mman.hpp" />
Expand Down Expand Up @@ -222,7 +221,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\version.hpp" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\accessor.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\mmap.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\mmap_dispatch.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\mmap_private.ipp" />
Expand Down
6 changes: 0 additions & 6 deletions builds/msvc/vs2026/libbitcoin-database/libbitcoin-database.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\finalizer.hpp">
<Filter>include\bitcoin\database\memory</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\interfaces\memory.hpp">
<Filter>include\bitcoin\database\memory\interfaces</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\interfaces\storage.hpp">
<Filter>include\bitcoin\database\memory\interfaces</Filter>
</ClInclude>
Expand Down Expand Up @@ -379,9 +376,6 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\accessor.ipp">
<Filter>include\bitcoin\database\impl\memory</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\mmap.ipp">
<Filter>include\bitcoin\database\impl\memory</Filter>
</None>
Expand Down
1 change: 0 additions & 1 deletion include/bitcoin/database.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
#include <bitcoin/database/memory/reader.hpp>
#include <bitcoin/database/memory/streamers.hpp>
#include <bitcoin/database/memory/utilities.hpp>
#include <bitcoin/database/memory/interfaces/memory.hpp>
#include <bitcoin/database/memory/interfaces/storage.hpp>
#include <bitcoin/database/primitives/arrayhead.hpp>
#include <bitcoin/database/primitives/arraymap.hpp>
Expand Down
96 changes: 0 additions & 96 deletions include/bitcoin/database/impl/memory/accessor.ipp
View file
Open in desktop

This file was deleted.

85 changes: 60 additions & 25 deletions include/bitcoin/database/impl/memory/mmap_dispatch.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,30 +33,6 @@ namespace database {
// Dispatch.
// ----------------------------------------------------------------------------

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

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

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

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

return std::next(memory_map_.front(), offset);
}

TEMPLATE
memory_ptr CLASS::set(size_t offset, size_t size, uint8_t backfill) NOEXCEPT
{
Expand Down Expand Up @@ -93,6 +69,37 @@ memory_ptr CLASS::set(size_t offset, size_t size, uint8_t backfill) NOEXCEPT
return get(offset);
}

TEMPLATE
memory_ptr 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))
return {};

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

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);
}

TEMPLATE
memory::iterator CLASS::get_at_raw(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)));

// Pointer otherwise unguarded, not remap safe (use for nopmaps columns).
return std::next(memory_map_.at(column), offset);
}

TEMPLATE
memory_ptr CLASS::get(size_t offset) const NOEXCEPT
{
Expand All @@ -109,7 +116,7 @@ memory_ptr CLASS::get_at(size_t column, size_t offset) const NOEXCEPT
const auto allocated = size() * widths.at(column);

// Takes a shared lock on remap_mutex_ until destruct, blocking remap.
const auto ptr = std::make_shared<access>(remap_mutex_);
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))
Expand All @@ -121,6 +128,34 @@ memory_ptr CLASS::get_at(size_t column, size_t offset) const NOEXCEPT
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
{
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.
memory out{ remap_mutex_ };

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

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

} // namespace database
} // namespace libbitcoin

Expand Down
Loading
Loading