Skip to content

Rename map<> to mmap<>. #849

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 3 commits into from
Jul 1, 2026
Merged

Rename map<> to mmap<>. #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25e85d8
Rename map<> to mmap<>.
evoskuil Jul 1, 2026
de32234
Use first mmap as authority for open/closed.
evoskuil Jul 1, 2026
96ff715
Whitespace (style).
evoskuil Jul 1, 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
12 changes: 6 additions & 6 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ test_libbitcoin_database_test_SOURCES = \
test/locks/flush_lock.cpp \
test/locks/interprocess_lock.cpp \
test/memory/accessor.cpp \
test/memory/map.cpp \
test/memory/mmap.cpp \
test/memory/utilities.cpp \
test/mocks/blocks.cpp \
test/mocks/blocks.hpp \
Expand Down Expand Up @@ -207,10 +207,10 @@ include_bitcoin_database_file_HEADERS = \
include_bitcoin_database_impl_memorydir = ${includedir}/bitcoin/database/impl/memory
include_bitcoin_database_impl_memory_HEADERS = \
include/bitcoin/database/impl/memory/accessor.ipp \
include/bitcoin/database/impl/memory/map.ipp \
include/bitcoin/database/impl/memory/map_dispatch.ipp \
include/bitcoin/database/impl/memory/map_private.ipp \
include/bitcoin/database/impl/memory/map_storage.ipp
include/bitcoin/database/impl/memory/mmap.ipp \
include/bitcoin/database/impl/memory/mmap_dispatch.ipp \
include/bitcoin/database/impl/memory/mmap_private.ipp \
include/bitcoin/database/impl/memory/mmap_storage.ipp

include_bitcoin_database_impl_primitivesdir = ${includedir}/bitcoin/database/impl/primitives
include_bitcoin_database_impl_primitives_HEADERS = \
Expand Down Expand Up @@ -313,10 +313,10 @@ include_bitcoin_database_memorydir = ${includedir}/bitcoin/database/memory
include_bitcoin_database_memory_HEADERS = \
include/bitcoin/database/memory/accessor.hpp \
include/bitcoin/database/memory/finalizer.hpp \
include/bitcoin/database/memory/map.hpp \
include/bitcoin/database/memory/maps.hpp \
include/bitcoin/database/memory/memory.hpp \
include/bitcoin/database/memory/mman.hpp \
include/bitcoin/database/memory/mmap.hpp \
include/bitcoin/database/memory/reader.hpp \
include/bitcoin/database/memory/streamers.hpp \
include/bitcoin/database/memory/utilities.hpp
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
<ClCompile Include="..\..\..\..\test\locks\interprocess_lock.cpp" />
<ClCompile Include="..\..\..\..\test\main.cpp" />
<ClCompile Include="..\..\..\..\test\memory\accessor.cpp" />
<ClCompile Include="..\..\..\..\test\memory\map.cpp" />
<ClCompile Include="..\..\..\..\test\memory\mmap.cpp" />
<ClCompile Include="..\..\..\..\test\memory\utilities.cpp">
<ObjectFileName>$(IntDir)test_memory_utilities.obj</ObjectFileName>
</ClCompile>
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<ClCompile Include="..\..\..\..\test\memory\accessor.cpp">
<Filter>src\memory</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\memory\map.cpp">
<ClCompile Include="..\..\..\..\test\memory\mmap.cpp">
<Filter>src\memory</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\memory\utilities.cpp">
Expand Down
10 changes: 5 additions & 5 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 @@ -155,10 +155,10 @@
<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\map.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\maps.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\memory.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\mman.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\mmap.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\reader.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\streamers.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\utilities.hpp" />
Expand Down Expand Up @@ -222,10 +222,10 @@
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\accessor.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\map.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\map_dispatch.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\map_private.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\map_storage.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" />
<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\hashhead.ipp" />
Expand Down
14 changes: 7 additions & 7 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 @@ -182,9 +182,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\interfaces\storage.hpp">
<Filter>include\bitcoin\database\memory\interfaces</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\map.hpp">
<Filter>include\bitcoin\database\memory</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\maps.hpp">
<Filter>include\bitcoin\database\memory</Filter>
</ClInclude>
Expand All @@ -194,6 +191,9 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\mman.hpp">
<Filter>include\bitcoin\database\memory</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\mmap.hpp">
<Filter>include\bitcoin\database\memory</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\reader.hpp">
<Filter>include\bitcoin\database\memory</Filter>
</ClInclude>
Expand Down Expand Up @@ -379,16 +379,16 @@
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\accessor.ipp">
<Filter>include\bitcoin\database\impl\memory</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\map.ipp">
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\mmap.ipp">
<Filter>include\bitcoin\database\impl\memory</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\map_dispatch.ipp">
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\mmap_dispatch.ipp">
<Filter>include\bitcoin\database\impl\memory</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\map_private.ipp">
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\mmap_private.ipp">
<Filter>include\bitcoin\database\impl\memory</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\map_storage.ipp">
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\mmap_storage.ipp">
<Filter>include\bitcoin\database\impl\memory</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\arrayhead.ipp">
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2026/libbitcoin-database-test/libbitcoin-database-test.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
<ClCompile Include="..\..\..\..\test\locks\interprocess_lock.cpp" />
<ClCompile Include="..\..\..\..\test\main.cpp" />
<ClCompile Include="..\..\..\..\test\memory\accessor.cpp" />
<ClCompile Include="..\..\..\..\test\memory\map.cpp" />
<ClCompile Include="..\..\..\..\test\memory\mmap.cpp" />
<ClCompile Include="..\..\..\..\test\memory\utilities.cpp">
<ObjectFileName>$(IntDir)test_memory_utilities.obj</ObjectFileName>
</ClCompile>
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2026/libbitcoin-database-test/libbitcoin-database-test.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<ClCompile Include="..\..\..\..\test\memory\accessor.cpp">
<Filter>src\memory</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\memory\map.cpp">
<ClCompile Include="..\..\..\..\test\memory\mmap.cpp">
<Filter>src\memory</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\memory\utilities.cpp">
Expand Down
10 changes: 5 additions & 5 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 @@ -155,10 +155,10 @@
<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\map.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\maps.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\memory.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\mman.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\mmap.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\reader.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\streamers.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\utilities.hpp" />
Expand Down Expand Up @@ -222,10 +222,10 @@
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\accessor.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\map.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\map_dispatch.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\map_private.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\map_storage.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" />
<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\hashhead.ipp" />
Expand Down
14 changes: 7 additions & 7 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 @@ -182,9 +182,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\interfaces\storage.hpp">
<Filter>include\bitcoin\database\memory\interfaces</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\map.hpp">
<Filter>include\bitcoin\database\memory</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\maps.hpp">
<Filter>include\bitcoin\database\memory</Filter>
</ClInclude>
Expand All @@ -194,6 +191,9 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\mman.hpp">
<Filter>include\bitcoin\database\memory</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\mmap.hpp">
<Filter>include\bitcoin\database\memory</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\reader.hpp">
<Filter>include\bitcoin\database\memory</Filter>
</ClInclude>
Expand Down Expand Up @@ -379,16 +379,16 @@
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\accessor.ipp">
<Filter>include\bitcoin\database\impl\memory</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\map.ipp">
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\mmap.ipp">
<Filter>include\bitcoin\database\impl\memory</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\map_dispatch.ipp">
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\mmap_dispatch.ipp">
<Filter>include\bitcoin\database\impl\memory</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\map_private.ipp">
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\mmap_private.ipp">
<Filter>include\bitcoin\database\impl\memory</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\map_storage.ipp">
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\mmap_storage.ipp">
<Filter>include\bitcoin\database\impl\memory</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\arrayhead.ipp">
Expand Down
2 changes: 1 addition & 1 deletion include/bitcoin/database.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
#include <bitcoin/database/locks/locks.hpp>
#include <bitcoin/database/memory/accessor.hpp>
#include <bitcoin/database/memory/finalizer.hpp>
#include <bitcoin/database/memory/map.hpp>
#include <bitcoin/database/memory/maps.hpp>
#include <bitcoin/database/memory/memory.hpp>
#include <bitcoin/database/memory/mman.hpp>
#include <bitcoin/database/memory/mmap.hpp>
#include <bitcoin/database/memory/reader.hpp>
#include <bitcoin/database/memory/streamers.hpp>
#include <bitcoin/database/memory/utilities.hpp>
Expand Down
15 changes: 6 additions & 9 deletions include/bitcoin/database/impl/memory/map.ipp → ...ude/bitcoin/database/impl/memory/mmap.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBBITCOIN_DATABASE_MEMORY_MAP_IPP
#define LIBBITCOIN_DATABASE_MEMORY_MAP_IPP
#ifndef LIBBITCOIN_DATABASE_MEMORY_MMAP_IPP
#define LIBBITCOIN_DATABASE_MEMORY_MMAP_IPP

#include <algorithm>
#include <filesystem>
Expand All @@ -32,7 +32,7 @@ namespace database {
// ----------------------------------------------------------------------------

TEMPLATE
CLASS::map1(const path& filename, size_t minimum, size_t expansion,
CLASS::mmap(const path& filename, size_t minimum, size_t expansion,
bool random) NOEXCEPT
requires (columns == one)
: filenames_{ filename },
Expand All @@ -44,7 +44,7 @@ CLASS::map1(const path& filename, size_t minimum, size_t expansion,
}

TEMPLATE
CLASS::map1(const paths& filenames, size_t minimum, size_t expansion,
CLASS::mmap(const paths& filenames, size_t minimum, size_t expansion,
bool random) NOEXCEPT
requires (columns > one)
: filenames_(filenames),
Expand All @@ -57,7 +57,7 @@ CLASS::map1(const paths& filenames, size_t minimum, size_t expansion,
}

TEMPLATE
CLASS::~map1() NOEXCEPT
CLASS::~mmap() NOEXCEPT
{
BC_ASSERT_MSG(!loaded_, "...");
BC_ASSERT_MSG(is_zero(logical_), "...");
Expand All @@ -76,10 +76,7 @@ TEMPLATE
bool CLASS::is_open() const NOEXCEPT
{
std::shared_lock field_lock(field_mutex_);
return std::ranges::any_of(opened_, [](auto opened) NOEXCEPT
{
return opened != file::invalid;
});
return opened_.front() != file::invalid;
}

TEMPLATE
Expand Down
4 changes: 2 additions & 2 deletions ...oin/database/impl/memory/map_dispatch.ipp → ...in/database/impl/memory/mmap_dispatch.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBBITCOIN_DATABASE_MEMORY_MAP_DISPATCH_IPP
#define LIBBITCOIN_DATABASE_MEMORY_MAP_DISPATCH_IPP
#ifndef LIBBITCOIN_DATABASE_MEMORY_MMAP_DISPATCH_IPP
#define LIBBITCOIN_DATABASE_MEMORY_MMAP_DISPATCH_IPP

#include <algorithm>
#include <filesystem>
Expand Down
4 changes: 2 additions & 2 deletions ...coin/database/impl/memory/map_private.ipp → ...oin/database/impl/memory/mmap_private.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBBITCOIN_DATABASE_MEMORY_MAP_PRIVATE_IPP
#define LIBBITCOIN_DATABASE_MEMORY_MAP_PRIVATE_IPP
#ifndef LIBBITCOIN_DATABASE_MEMORY_MMAP_PRIVATE_IPP
#define LIBBITCOIN_DATABASE_MEMORY_MMAP_PRIVATE_IPP

#include <algorithm>
#include <fcntl.h>
Expand Down
13 changes: 6 additions & 7 deletions ...coin/database/impl/memory/map_storage.ipp → ...oin/database/impl/memory/mmap_storage.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBBITCOIN_DATABASE_MEMORY_MAP_STORAGE_IPP
#define LIBBITCOIN_DATABASE_MEMORY_MAP_STORAGE_IPP
#ifndef LIBBITCOIN_DATABASE_MEMORY_MMAP_STORAGE_IPP
#define LIBBITCOIN_DATABASE_MEMORY_MMAP_STORAGE_IPP

#include <filesystem>
#include <mutex>
Expand Down Expand Up @@ -69,7 +69,7 @@ code CLASS::open() NOEXCEPT
{
std::unique_lock field_lock(field_mutex_);

for (const auto& descriptor : opened_)
for (const auto& descriptor: opened_)
if (descriptor != file::invalid)
return error::open_open;

Expand Down Expand Up @@ -97,12 +97,11 @@ code CLASS::close() NOEXCEPT
if (loaded_)
return error::close_loaded;

for (const auto& descriptor: opened_)
if (descriptor == file::invalid)
return error::success;
if (opened_.front() == file::invalid)
return error::success;

logical_ = zero;
for (auto& descriptor : opened_)
for (auto& descriptor: opened_)
{
if (descriptor != file::invalid)
{
Expand Down
4 changes: 2 additions & 2 deletions include/bitcoin/database/memory/maps.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBBITCOIN_DATABASE_MEMORY_MAPS_HPP
#define LIBBITCOIN_DATABASE_MEMORY_MAPS_HPP
#ifndef LIBBITCOIN_DATABASE_MEMORY_MMAPS_HPP
#define LIBBITCOIN_DATABASE_MEMORY_MMAPS_HPP

#include <tuple>
#include <filesystem>
Expand Down
2 changes: 1 addition & 1 deletion include/bitcoin/database/memory/memory.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
#include <bitcoin/database/memory/finalizer.hpp>
#include <bitcoin/database/memory/interfaces/memory.hpp>
#include <bitcoin/database/memory/interfaces/storage.hpp>
#include <bitcoin/database/memory/map.hpp>
#include <bitcoin/database/memory/maps.hpp>
#include <bitcoin/database/memory/mman.hpp>
#include <bitcoin/database/memory/mmap.hpp>
#include <bitcoin/database/memory/streamers.hpp>

#endif
Loading
Loading