Skip to content

Remove custom memory allocator (dead code). #817

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 1 commit into from
May 27, 2026
Merged

Remove custom memory allocator (dead code). #817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions include/bitcoin/network/beast.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,8 @@ namespace http
/// beast::http::empty_body
using empty_body = boost::beast::http::empty_body;

/// beast::http::vector_body<uint8_t, bc::allocator<uint8_t>>
using chunk_body = boost::beast::http::vector_body<uint8_t,
allocator<uint8_t>>;
/// beast::http::vector_body<uint8_t>
using chunk_body = boost::beast::http::vector_body<uint8_t>;

// This is wrapped for http_body.
/// beast::http::file_body
Expand Down
13 changes: 0 additions & 13 deletions include/bitcoin/network/channels/channel_peer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,7 @@ class BCT_API channel_peer
inline channel_peer(const logger& log, const socket::ptr& socket,
uint64_t identifier, const settings_t& settings,
const options_t& options) NOEXCEPT
: channel_peer(mallocator_, log, socket, identifier, settings, options)
{
}

/// Construct a p2p channel to encapsulate and communicate on the socket.
inline channel_peer(memory& allocator, const logger& log,
const socket::ptr& socket, uint64_t identifier,
const settings_t& settings, const options_t& options) NOEXCEPT
: channel(log, socket, identifier, settings, options),
allocator_(allocator),
negotiated_version_(settings.protocol_maximum)
{
}
Expand Down Expand Up @@ -148,11 +139,7 @@ class BCT_API channel_peer
const system::chunk_cptr& payload,
const result_handler& handler) NOEXCEPT;

// Only passes static member get_area(), so safe to use statically.
static default_memory mallocator_;

// These are protected by strand/order.
memory& allocator_;
uint32_t negotiated_version_;
messages::peer::version::cptr peer_version_{};
dispatcher dispatcher_{};
Expand Down
2 changes: 0 additions & 2 deletions src/channels/channel_peer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ BC_PUSH_WARNING(NO_VALUE_OR_CONST_REF_SHARED_PTR)
BC_PUSH_WARNING(SMART_PTR_NOT_NEEDED)
BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)

default_memory channel_peer::mallocator_ = default_memory{};

// Start/stop/resume (started upon create).
// ----------------------------------------------------------------------------

Expand Down
3 changes: 1 addition & 2 deletions test/channels/channel_peer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,13 @@ const channel_peer::options_t options{ "test" };
BOOST_AUTO_TEST_CASE(channel_peer__stopped__default__false)
{
constexpr auto expected = 42u;
default_memory memory{};
const logger log{};
threadpool pool(1);
asio::strand strand(pool.service().get_executor());
const settings set(bc::system::chain::selection::mainnet);
network::socket::parameters params{ .maximum_request = 42 };
auto socket_ptr = std::make_shared<network::socket>(log, pool.service(), std::move(params));
auto channel_ptr = std::make_shared<channel_peer>(memory, log, socket_ptr, expected, set, options);
auto channel_ptr = std::make_shared<channel_peer>(log, socket_ptr, expected, set, options);
BOOST_REQUIRE(!channel_ptr->stopped());

BOOST_REQUIRE_NE(channel_ptr->nonce(), zero);
Expand Down
15 changes: 5 additions & 10 deletions test/sessions/session.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,6 @@ const mock_channel::options_t options{ "test" };

BOOST_AUTO_TEST_CASE(session__start_channel__session_not_started__handlers_service_stopped_channel_service_stopped_not_pent_or_stored)
{
default_memory memory{};
const logger log{};
settings set(selection::mainnet);
mock_net net(set, log);
Expand All @@ -614,7 +613,7 @@ BOOST_AUTO_TEST_CASE(session__start_channel__session_not_started__handlers_servi

socket::parameters params{ .maximum_request = 42 };
const auto socket = std::make_shared<network::socket>(net.log, net.service(), std::move(params));
const auto channel = std::make_shared<mock_channel>(memory, net.log, socket, 42, session->network_settings(), options);
const auto channel = std::make_shared<mock_channel>(net.log, socket, 42, session->network_settings(), options);

std::promise<code> started_channel;
std::promise<code> stopped_channel;
Expand Down Expand Up @@ -652,7 +651,6 @@ BOOST_AUTO_TEST_CASE(session__start_channel__session_not_started__handlers_servi

BOOST_AUTO_TEST_CASE(session__start_channel__channel_not_started__handlers_channel_stopped_channel_channel_stopped_stored_and_not_counted)
{
default_memory memory{};
const logger log{};
settings set(selection::mainnet);
mock_net net(set, log);
Expand All @@ -671,7 +669,7 @@ BOOST_AUTO_TEST_CASE(session__start_channel__channel_not_started__handlers_chann

socket::parameters params{ .maximum_request = 42 };
const auto socket = std::make_shared<network::socket>(net.log, net.service(), std::move(params));
const auto channel = std::make_shared<mock_channel>(memory, net.log, socket, 42, session->network_settings(), options);
const auto channel = std::make_shared<mock_channel>(net.log, socket, 42, session->network_settings(), options);

// Stop the channel (started by default).
std::promise<bool> unstarted_channel;
Expand Down Expand Up @@ -731,7 +729,6 @@ BOOST_AUTO_TEST_CASE(session__start_channel__channel_not_started__handlers_chann

BOOST_AUTO_TEST_CASE(session__start_channel__all_started__handlers_expected_channel_service_stopped_stored_and_counted)
{
default_memory memory{};
const logger log{};
settings set(selection::mainnet);
set.outbound.host_pool_capacity = 0;
Expand Down Expand Up @@ -762,7 +759,7 @@ BOOST_AUTO_TEST_CASE(session__start_channel__all_started__handlers_expected_chan

socket::parameters params{ .maximum_request = 42 };
const auto socket = std::make_shared<network::socket>(net.log, net.service(), std::move(params));
const auto channel = std::make_shared<mock_channel>(memory, net.log, socket, 42, session->network_settings(), options);
const auto channel = std::make_shared<mock_channel>(net.log, socket, 42, session->network_settings(), options);

std::promise<code> started_channel;
std::promise<code> stopped_channel;
Expand Down Expand Up @@ -813,7 +810,6 @@ BOOST_AUTO_TEST_CASE(session__start_channel__all_started__handlers_expected_chan

BOOST_AUTO_TEST_CASE(session__start_channel__outbound_all_started__handlers_expected_channel_success_stored_and_counted)
{
default_memory memory{};
const logger log{};
settings set(selection::mainnet);
set.outbound.host_pool_capacity = 0;
Expand Down Expand Up @@ -845,7 +841,7 @@ BOOST_AUTO_TEST_CASE(session__start_channel__outbound_all_started__handlers_expe

socket::parameters params{ .maximum_request = 42 };
const auto socket = std::make_shared<network::socket>(net.log, net.service(), std::move(params));
const auto channel = std::make_shared<mock_channel_no_read>(memory, net.log, socket, 42, session->network_settings(), options);
const auto channel = std::make_shared<mock_channel_no_read>(net.log, socket, 42, session->network_settings(), options);

std::promise<code> started_channel;
std::promise<code> stopped_channel;
Expand Down Expand Up @@ -898,7 +894,6 @@ BOOST_AUTO_TEST_CASE(session__start_channel__outbound_all_started__handlers_expe

BOOST_AUTO_TEST_CASE(session__start_channel__inbound_all_started__handlers_expected_channel_success_not_stored_and_counted)
{
default_memory memory{};
const logger log{};
settings set(selection::mainnet);
set.outbound.host_pool_capacity = 0;
Expand Down Expand Up @@ -930,7 +925,7 @@ BOOST_AUTO_TEST_CASE(session__start_channel__inbound_all_started__handlers_expec

socket::parameters params{ .maximum_request = 42 };
const auto socket = std::make_shared<network::socket>(net.log, net.service(), std::move(params));
const auto channel = std::make_shared<mock_channel_no_read>(memory, net.log, socket, 42, session->network_settings(), options);
const auto channel = std::make_shared<mock_channel_no_read>(net.log, socket, 42, session->network_settings(), options);

std::promise<code> started_channel;
std::promise<code> stopped_channel;
Expand Down
12 changes: 0 additions & 12 deletions test/test.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,6 @@ std::ostream& operator<<(std::ostream& stream,
return stream;
}

// std_vector<Type> -> join(<<Type)
template <typename Type>
std::ostream& operator<<(std::ostream& stream,
const std_vector<Type>& values) NOEXCEPT
{
// Ok when testing serialize because only used for error message out.
BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
stream << system::serialize(values);
BC_POP_WARNING()
return stream;
}

// array<Type, Size> -> join(<<Type)
template <typename Type, size_t Size>
std::ostream& operator<<(std::ostream& stream,
Expand Down
Loading