From f3ed48479f9209e708cd17698dc9e778e07284cd Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 7 Apr 2013 22:06:24 +0200 Subject: [PATCH] Fix an issue where clients would be put twice into sleeping_clients (probably since the EPOLLOUT trigger would go off once unexpectedly), causing a chain reaction where we did tons of empty write() calls. --- server.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server.cpp b/server.cpp index 54e6b5e..94350fa 100644 --- a/server.cpp +++ b/server.cpp @@ -404,7 +404,7 @@ sending_header_or_error_again: // This is postcondition #3. client->state = Client::SENDING_DATA; client->bytes_sent = client->stream->data_size; - sleeping_clients.push_back(client); + put_client_to_sleep(client); return; } case Client::SENDING_DATA: { @@ -412,6 +412,9 @@ sending_header_or_error_again: // but resync will be the mux's problem. const Stream *stream = client->stream; size_t bytes_to_send = stream->data_size - client->bytes_sent; + if (bytes_to_send == 0) { + return; + } if (bytes_to_send > BACKLOG_SIZE) { fprintf(stderr, "WARNING: fd %d lost %lld bytes, maybe too slow connection\n", client->sock, -- 2.39.2