+/*
+ * Copyright (C) 1996-2020 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
#include "squid.h"
#include "comm/AcceptLimiter.h"
#include "comm/Connection.h"
#include "comm/TcpAcceptor.h"
#include "fde.h"
+#include "globals.h"
Comm::AcceptLimiter Comm::AcceptLimiter::Instance_;
-Comm::AcceptLimiter &Comm::AcceptLimiter::Instance()
+Comm::AcceptLimiter &
+Comm::AcceptLimiter::Instance()
{
return Instance_;
}
void
-Comm::AcceptLimiter::defer(Comm::TcpAcceptor *afd)
+Comm::AcceptLimiter::defer(const Comm::TcpAcceptor::Pointer &afd)
{
- afd->isLimited++;
- debugs(5, 5, HERE << afd->conn << " x" << afd->isLimited);
- deferred.push_back(afd);
+ debugs(5, 5, afd->conn << "; already queued: " << deferred_.size());
+ deferred_.push_back(afd);
}
void
-Comm::AcceptLimiter::removeDead(const Comm::TcpAcceptor *afd)
+Comm::AcceptLimiter::removeDead(const Comm::TcpAcceptor::Pointer &afd)
{
- for (unsigned int i = 0; i < deferred.size() && afd->isLimited > 0; i++) {
- if (deferred[i] == afd) {
- deferred[i]->isLimited--;
- deferred[i] = NULL; // fast. kick() will skip empty entries later.
- debugs(5, 5, HERE << afd->conn << " x" << afd->isLimited);
+ for (auto it = deferred_.begin(); it != deferred_.end(); ++it) {
+ if (*it == afd) {
+ *it = nullptr; // fast. kick() will skip empty entries later.
+ debugs(5,4, "Abandoned client TCP SYN by closing socket: " << afd->conn);
+ return;
}
}
+ debugs(5,4, "Not found " << afd->conn << " in queue, size: " << deferred_.size());
}
void
Comm::AcceptLimiter::kick()
{
- // TODO: this could be optimized further with an iterator to search
- // looking for first non-NULL, followed by dumping the first N
- // with only one shift()/pop_front operation
-
- debugs(5, 5, HERE << " size=" << deferred.size());
- while (deferred.size() > 0 && fdNFree() >= RESERVED_FD) {
+ debugs(5, 5, "size=" << deferred_.size());
+ while (deferred_.size() > 0 && Comm::TcpAcceptor::okToAccept()) {
/* NP: shift() is equivalent to pop_front(). Giving us a FIFO queue. */
- TcpAcceptor *temp = deferred.shift();
- if (temp != NULL) {
- debugs(5, 5, HERE << " doing one.");
- temp->isLimited--;
+ TcpAcceptor::Pointer temp = deferred_.front();
+ deferred_.erase(deferred_.begin());
+ if (temp.valid()) {
+ debugs(5, 5, "doing one.");
temp->acceptNext();
break;
}
}
}
+