boost/redis
2
0
Fork 0
mirror of https://github.com/boostorg/redis.git synced 2026-01-19 04:42:09 +00:00
Code Issues Projects Releases Wiki Activity

Improvements in the writer cancellation.

Browse Source
This commit is contained in:
Marcelo Zimbres
2022-10-22 21:23:33 +02:00
parent d8b67f6e23
commit 268ea2c10f
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/aedis/detail/connection_base.hpp
View File

@@ -370,6 +370,11 @@ private:
{
write_buffer_ += ri.get_request().payload();
cmds_ += ri.get_request().size();
// TODO: We mark a request a written only after a successful
// write on the socket and not before writting. Otherwise, if
// the write fails they will be seen as written and may be
// removed with cancel(run).
ri.mark_written();
}

18
include/aedis/detail/connection_ops.hpp
View File

@@ -498,6 +498,7 @@ struct writer_op {
yield
boost::asio::async_write(conn->next_layer(), boost::asio::buffer(conn->write_buffer_), std::move(self));
if (ec) {
conn->cancel(operation::run);
self.complete(ec);
return;
}
@@ -509,21 +510,8 @@ struct writer_op {
conn->cancel_push_requests();
}
if (conn->is_open()) {
yield
conn->writer_timer_.async_wait(std::move(self));
if (ec != boost::asio::error::operation_aborted) {
conn->cancel(operation::run);
self.complete(ec);
return;
}
// The timer may be canceled either to stop the write op
// or to proceed to the next write, the difference between
// the two is that for the former the socket will be
// closed first. We check for that below.
}
if (!conn->is_open()) {
yield conn->writer_timer_.async_wait(std::move(self));
if (self.get_cancellation_state().cancelled() != boost::asio::cancellation_type_t::none) {
// Notice this is not an error of the op, stoping was
// requested from the outside, so we complete with
// success.