Skip to content

BaseSocket async_write buffer lifecycle [API-1814] [API-1808] [API-1807] #1104

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
OzanCansel merged 7 commits into from
Feb 23, 2023
Merged

BaseSocket async_write buffer lifecycle [API-1814] [API-1808] [API-1807] #1104

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e2cb1d8
BOOST_THROW_EXCEPTION is used
akeles85 Feb 21, 2023
111a826
lifetime of invocation fixed for async_write
akeles85 Feb 22, 2023
6f08a18
Merge branch 'hazelcast:master' into test_smoke
akeles85 Feb 22, 2023
da62c1e
code review fixes
akeles85 Feb 23, 2023
fb9697a
clang format
akeles85 Feb 23, 2023
9233f1f
message lifecycle
akeles85 Feb 23, 2023
f90d3b6
Merge branch 'hazelcast:master' into test_smoke
akeles85 Feb 23, 2023
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
37 changes: 23 additions & 14 deletions hazelcast/include/hazelcast/client/internal/socket/BaseSocket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,27 +117,30 @@ class BaseSocket : public hazelcast::client::socket
{
check_connection(connection, invocation);
auto message = invocation->get_client_message();
socket_strand_.post([connection, invocation, message, this]() {
socket_strand_.post([connection, invocation, message, this]() mutable {
if (!check_connection(connection, invocation)) {
return;
}

add_invocation_to_map(connection, invocation, message);

auto& datas = message->get_buffer();
std::vector<boost::asio::const_buffer> buffers;
buffers.reserve(datas.size());

entry outbox_entry;
outbox_entry.buffers.reserve(datas.size());
for (const auto& data : datas) {
buffers.emplace_back(boost::asio::buffer(data));
outbox_entry.buffers.emplace_back(boost::asio::buffer(data));
}
this->outbox_.push_back(buffers);
outbox_entry.message = std::move(message);
outbox_entry.invocation = std::move(invocation);
this->outbox_.push_back(std::move(outbox_entry));

if (this->outbox_.size() > 1) {
// async write is in progress
return;
}

do_write(connection, invocation);
do_write(connection);
});
}

Expand Down Expand Up @@ -243,12 +246,12 @@ class BaseSocket : public hazelcast::client::socket
}));
}

void do_write(const std::shared_ptr<connection::Connection> connection,
const std::shared_ptr<spi::impl::ClientInvocation> invocation)
void do_write(const std::shared_ptr<connection::Connection> connection)
{
auto handler =
[connection, invocation, this](const boost::system::error_code& ec,
std::size_t bytes_written) {
[connection, this](const boost::system::error_code& ec,
std::size_t bytes_written) {
auto invocation = std::move(outbox_[0].invocation);
this->outbox_.pop_front();

if (ec) {
Expand All @@ -263,13 +266,12 @@ class BaseSocket : public hazelcast::client::socket
connection->last_write_time(std::chrono::steady_clock::now());

if (!this->outbox_.empty()) {
do_write(connection, invocation);
do_write(connection);
}
}
};

const auto& message = outbox_[0];

const auto& message = outbox_[0].buffers;
boost::asio::async_write(
socket_, message, socket_strand_.wrap(handler));
}
Expand Down Expand Up @@ -336,7 +338,14 @@ class BaseSocket : public hazelcast::client::socket
boost::asio::ip::tcp::resolver& resolver_;
T socket_;
int32_t call_id_counter_{ 0 };
typedef std::deque<std::vector<boost::asio::const_buffer>> Outbox;
struct entry
{
std::vector<boost::asio::const_buffer> buffers;
std::shared_ptr<spi::impl::ClientInvocation> invocation;
std::shared_ptr<protocol::ClientMessage> message;
};

typedef std::deque<entry> Outbox;
Outbox outbox_;
};
} // namespace socket
Expand Down