Skip to content

Use cursored writes instead #7

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.

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

Open
wants to merge 8 commits into
base: mdbx-benchmarking
Choose a base branch
from
Open
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
7 changes: 7 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,11 @@ if(WITH_USDT)
find_package(USDT MODULE REQUIRED)
endif()

option(WITH_MDBX "Enable libmdbx for the coindsb." ON)
if(WITH_MDBX)
find_package(MDBX MODULE REQUIRED)
endif()

cmake_dependent_option(ENABLE_EXTERNAL_SIGNER "Enable external signer support." ON "NOT WIN32" OFF)

cmake_dependent_option(WITH_QRENCODE "Enable QR code support." ON "BUILD_GUI" OFF)
Expand Down Expand Up @@ -234,6 +239,7 @@ if(BUILD_FOR_FUZZING)
set(BUILD_WALLET_TOOL OFF)
set(BUILD_GUI OFF)
set(ENABLE_EXTERNAL_SIGNER OFF)
set(WITH_MDBX OFF)
set(WITH_MINIUPNPC OFF)
set(WITH_ZMQ OFF)
set(BUILD_TESTS OFF)
Expand Down Expand Up @@ -620,6 +626,7 @@ message(" ZeroMQ .............................. ${WITH_ZMQ}")
message(" USDT tracing ........................ ${WITH_USDT}")
message(" QR code (GUI) ....................... ${WITH_QRENCODE}")
message(" DBus (GUI, Linux only) .............. ${WITH_DBUS}")
message(" libmdbx coinsdb .............. ${WITH_MDBX}")
message("Tests:")
message(" test_bitcoin ........................ ${BUILD_TESTS}")
message(" test_bitcoin-qt ..................... ${BUILD_GUI_TESTS}")
Expand Down
29 changes: 29 additions & 0 deletions cmake/module/FindMDBX.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Copyright (c) 2024-present The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or https://opensource.org/license/mit/.

find_path(MDBX_INCLUDE_DIR
NAMES mdbx.h++
)

find_library(MDBX_LIBRARY
NAMES mdbx
)

include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(MDBX
REQUIRED_VARS MDBX_LIBRARY MDBX_INCLUDE_DIR
)

if(MDBX_FOUND AND NOT TARGET MDBX::MDBX)
add_library(MDBX::MDBX STATIC IMPORTED)
set_target_properties(MDBX::MDBX PROPERTIES
IMPORTED_LOCATION "${MDBX_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${MDBX_INCLUDE_DIR}"
)
endif()

mark_as_advanced(
MDBX_INCLUDE_DIR
MDBX_LIBRARY
)
6 changes: 5 additions & 1 deletion depends/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ NO_WALLET ?=
NO_ZMQ ?=
NO_UPNP ?=
NO_USDT ?=
NO_MDBX ?=
MULTIPROCESS ?=
LTO ?=
NO_HARDEN ?=
Expand Down Expand Up @@ -159,11 +160,13 @@ wallet_packages_$(NO_WALLET) = $(bdb_packages_) $(sqlite_packages_)

upnp_packages_$(NO_UPNP) = $(upnp_packages)

libmdbx_packages_$(NO_MDBX) = $(libmdbx_packages)

zmq_packages_$(NO_ZMQ) = $(zmq_packages)
multiprocess_packages_$(MULTIPROCESS) = $(multiprocess_packages)
usdt_packages_$(NO_USDT) = $(usdt_$(host_os)_packages)

packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(boost_packages_) $(libevent_packages_) $(qt_packages_) $(wallet_packages_) $(upnp_packages_) $(usdt_packages_)
packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(boost_packages_) $(libevent_packages_) $(qt_packages_) $(wallet_packages_) $(upnp_packages_) $(libmdbx_packages_) $(usdt_packages_)
native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages)

ifneq ($(zmq_packages_),)
Expand Down Expand Up @@ -231,6 +234,7 @@ $(host_prefix)/toolchain.cmake : toolchain.cmake.in $(host_prefix)/.stamp_$(fina
-e 's|@bdb_packages@|$(bdb_packages_)|' \
-e 's|@sqlite_packages@|$(sqlite_packages_)|' \
-e 's|@upnp_packages@|$(upnp_packages_)|' \
-e 's|@libmdbx_packages@|$(libmdbx_packages_)|' \
-e 's|@usdt_packages@|$(usdt_packages_)|' \
-e 's|@no_harden@|$(NO_HARDEN)|' \
-e 's|@multiprocess@|$(MULTIPROCESS)|' \
Expand Down
24 changes: 24 additions & 0 deletions depends/packages/libmdbx.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package=libmdbx
$(package)_version=0.13.1
$(package)_download_path=https://libmdbx.dqdkfa.ru/release
$(package)_file_name=libmdbx-amalgamated-0.13.1.tar.xz
$(package)_sha256_hash=aabb6bf34b8699b06de717a8facf8820a2fdd1bbe4ae0e90c9a2bbdb3880181d

define $(package)_extract_cmds
mkdir -p $($(package)_extract_dir) && \
echo "$($(package)_sha256_hash) $($(package)_source)" > $($(package)_extract_dir)/.$($(package)_file_name).hash && \
$(build_SHA256SUM) -c $($(package)_extract_dir)/.$($(package)_file_name).hash && \
$(build_TAR) --no-same-owner -xf $($(package)_source)
endef

define $(package)_config_cmds
$($(package)_cmake) -S . -B .
endef

define $(package)_build_cmds
$(MAKE)
endef

define $(package)_stage_cmds
cmake --install . --prefix $($(package)_staging_prefix_dir)
endef
2 changes: 2 additions & 0 deletions depends/packages/packages.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ zmq_packages=zeromq

upnp_packages=miniupnpc

libmdbx_packages=libmdbx

multiprocess_packages = libmultiprocess capnp
multiprocess_native_packages = native_libmultiprocess native_capnp

Expand Down
7 changes: 7 additions & 0 deletions depends/toolchain.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,13 @@ else()
set(WITH_USDT ON CACHE BOOL "")
endif()

set(libmdbx_packages @libmdbx_packages@)
if("${libmdbx_packages}" STREQUAL "")
set(WITH_MDBX OFF CACHE BOOL "")
else()
set(WITH_MDBX ON CACHE BOOL "")
endif()

if("@no_harden@")
set(ENABLE_HARDENING OFF CACHE BOOL "")
else()
Expand Down
1 change: 1 addition & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@ target_link_libraries(bitcoin_node
Boost::headers
$<TARGET_NAME_IF_EXISTS:libevent::libevent>
$<TARGET_NAME_IF_EXISTS:libevent::pthreads>
$<TARGET_NAME_IF_EXISTS:MDBX::MDBX>
$<TARGET_NAME_IF_EXISTS:MiniUPnPc::MiniUPnPc>
$<TARGET_NAME_IF_EXISTS:bitcoin_zmq>
$<TARGET_NAME_IF_EXISTS:USDT::headers>
Expand Down
Loading