Commit 8d93bbab authored by Jakob Otto's avatar Jakob Otto

Include review feedback

parent 29535532
...@@ -27,7 +27,9 @@ namespace defaults { ...@@ -27,7 +27,9 @@ namespace defaults {
namespace middleman { namespace middleman {
/// Maximum number of payload buffers to keep in transport
extern const size_t max_output_buffers; extern const size_t max_output_buffers;
/// Maximum number of header buffers to keep in transport
extern const size_t max_header_buffers; extern const size_t max_header_buffers;
} // namespace middleman } // namespace middleman
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* | | / _ \ | |_ Actor * * | | / _ \ | |_ Actor *
* | |___ / ___ \| _| Framework * * | |___ / ___ \| _| Framework *
* \____/_/ \_|_| * * \____/_/ \_|_| *
* * * *#
* Copyright 2011-2018 Dominik Charousset * * Copyright 2011-2018 Dominik Charousset *
* * * *
* Distributed under the terms and conditions of the BSD 3-Clause License or * * Distributed under the terms and conditions of the BSD 3-Clause License or *
...@@ -252,10 +252,12 @@ private: ...@@ -252,10 +252,12 @@ private:
auto& buf = front.second; auto& buf = front.second;
written_ = 0; written_ = 0;
buf.clear(); buf.clear();
if (is_header && free_header_bufs_.size() < max_header_bufs_) if (is_header) {
if (free_header_bufs_.size() < max_header_bufs_)
free_header_bufs_.emplace_back(std::move(buf)); free_header_bufs_.emplace_back(std::move(buf));
else if (free_bufs_.size() < max_output_bufs_) } else if (free_bufs_.size() < max_output_bufs_) {
free_bufs_.emplace_back(std::move(buf)); free_bufs_.emplace_back(std::move(buf));
}
write_queue_.pop_front(); write_queue_.pop_front();
}; };
// nothing to write // nothing to write
...@@ -276,7 +278,7 @@ private: ...@@ -276,7 +278,7 @@ private:
recycle(); recycle();
written_ = 0; written_ = 0;
} else { } else {
written_ = *num_bytes; written_ += *num_bytes;
return false; return false;
} }
} else { } else {
...@@ -313,7 +315,7 @@ private: ...@@ -313,7 +315,7 @@ private:
size_t written_; size_t written_;
endpoint_manager* manager_; endpoint_manager* manager_;
}; // namespace net };
} // namespace net } // namespace net
} // namespace caf } // namespace caf
...@@ -287,7 +287,7 @@ error application::handle_resolve_request(packet_writer& writer, header rec_hdr, ...@@ -287,7 +287,7 @@ error application::handle_resolve_request(packet_writer& writer, header rec_hdr,
binary_deserializer source{&executor_, received}; binary_deserializer source{&executor_, received};
if (auto err = source.begin_sequence(path_size)) if (auto err = source.begin_sequence(path_size))
return err; return err;
// We expect the received to consist only of the path. // We expect the received buffer to contain the path only.
if (path_size != source.remaining()) if (path_size != source.remaining())
return ec::invalid_payload; return ec::invalid_payload;
auto remainder = source.remainder(); auto remainder = source.remainder();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment