Skip to content
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

Jump to bottom

control: Limit memory use by control connections. #208

Merged
merged 1 commit into from
Jul 26, 2023
Merged

control: Limit memory use by control connections. #208

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
3 changes: 3 additions & 0 deletions src/control.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1153,6 +1153,7 @@ bool control_conn_t::queue_packet(const char *pkt, unsigned size) noexcept
// Create a vector out of the (remaining part of the) packet:
try {
outbuf.emplace_back(pkt, pkt + size);
outbuf_size += size;
mobin-2008 marked this conversation as resolved.
Show resolved Hide resolved
return true;
}
catch (std::bad_alloc &baexc) {
Expand Down Expand Up @@ -1202,6 +1203,7 @@ bool control_conn_t::queue_packet(std::vector<char> &&pkt) noexcept

try {
outbuf.emplace_back(std::move(pkt));
outbuf_size += pkt.size();
return true;
}
catch (std::bad_alloc &baexc) {
Expand Down Expand Up @@ -1290,6 +1292,7 @@ bool control_conn_t::send_data() noexcept
outpkt_index += written;
if (outpkt_index == pkt.size()) {
// We've finished this packet, move on to the next:
outbuf_size -= pkt.size();
outbuf.pop_front();
outpkt_index = 0;
if (oom_close) {
Expand Down
7 changes: 5 additions & 2 deletions src/includes/control.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ inline dasynq::rearm control_conn_cb(eventloop_t *loop, control_conn_watcher *wa
extern control_conn_t * rollback_handler_conn;

extern int active_control_conns;
constexpr int OUTBUF_LIMIT = 16384; // 16KB

// "packet" format:
// (1 byte) packet type
Expand Down Expand Up @@ -111,6 +112,8 @@ class control_conn_t : private service_listener

// Buffer for outgoing packets. Each outgoing back is represented as a vector<char>.
list<vector<char>> outbuf;
// Current output buffer size in bytes.
unsigned outbuf_size = 0;
// Current index within the first outgoing packet (all previous bytes have been sent).
unsigned outpkt_index = 0;

Expand Down Expand Up @@ -181,7 +184,7 @@ class control_conn_t : private service_listener
bool data_ready() noexcept;

bool send_data() noexcept;

// Check if any dependents will be affected by stopping a service, generate a response packet if so.
// had_dependents will be set true if the service should not be stopped, false otherwise.
// Returns false if the connection must be closed, true otherwise.
Expand Down Expand Up @@ -250,7 +253,7 @@ inline dasynq::rearm control_conn_cb(eventloop_t * loop, control_conn_watcher *
}

int watch_flags = 0;
if (!conn->bad_conn_close) {
if (!conn->bad_conn_close && conn->outbuf_size < OUTBUF_LIMIT) {
watch_flags |= dasynq::IN_EVENTS;
}
if (!conn->outbuf.empty() || conn->bad_conn_close) {
Expand Down