-
/*
- * $Id: pconn.cc,v 1.45 2005/12/06 23:03:34 wessels Exp $
+ * $Id$
*
* DEBUG: section 48 Persistent Connections
* AUTHOR: Duane Wessels
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
*/
#include "squid.h"
-#include "Store.h"
#include "comm.h"
-#include "pconn.h"
+#include "comm/Connection.h"
#include "fde.h"
+#include "mgr/Registration.h"
+#include "pconn.h"
+#include "Store.h"
#define PCONN_FDS_SZ 8 /* pconn set size, increase for better memcache hit rate */
-static PconnModule *ThePconnModule = NULL;
-static MemAllocator *pconn_fds_pool = NULL;
-static OBJH PconnModuleDumpWrapper;
+//TODO: re-attach to MemPools. WAS: static MemAllocator *pconn_fds_pool = NULL;
+PconnModule * PconnModule::instance = NULL;
CBDATA_CLASS_INIT(IdleConnList);
/* ========== IdleConnList ============================================ */
-IdleConnList::IdleConnList(const char *key, PconnPool *thePool) : parent(thePool)
+IdleConnList::IdleConnList(const char *key, PconnPool *thePool) :
+ capacity_(PCONN_FDS_SZ),
+ size_(0),
+ parent_(thePool)
{
hash.key = xstrdup(key);
- nfds_alloc = PCONN_FDS_SZ;
- nfds = 0;
- fds = (int *)pconn_fds_pool->alloc();
+ theList_ = new Comm::ConnectionPointer[capacity_];
+// TODO: re-attach to MemPools. WAS: theList = (?? *)pconn_fds_pool->alloc();
}
IdleConnList::~IdleConnList()
{
+ parent_->unlinkList(this);
- parent->unlinkList(this);
-
- if (nfds_alloc == PCONN_FDS_SZ)
- pconn_fds_pool->free(fds);
+/* TODO: re-attach to MemPools.
+ if (capacity_ == PCONN_FDS_SZ)
+ pconn_fds_pool->freeOne(theList_);
else
- xfree(fds);
+*/
+ delete[] theList_;
xfree(hash.key);
}
+/** Search the list. Matches by FD socket number.
+ * Performed from the end of list where newest entries are.
+ *
+ * \retval <0 The connection is not listed
+ * \retval >=0 The connection array index
+ */
int
-IdleConnList::findFDIndex (int fd)
+IdleConnList::findIndexOf(const Comm::ConnectionPointer &conn) const
{
- int index;
-
- for (index = nfds - 1; index >= 0; --index) {
- if (fds[index] == fd)
+ for (int index = size_ - 1; index >= 0; --index) {
+ if (conn->fd == theList_[index]->fd) {
+ debugs(48, 3, HERE << "found " << conn << " at index " << index);
return index;
+ }
}
+ debugs(48, 2, HERE << conn << " NOT FOUND!");
return -1;
}
-void
-IdleConnList::removeFD(int fd)
+/** Remove the entry at specified index.
+ * \retval false The index is not an in-use entry.
+ */
+bool
+IdleConnList::removeAt(int index)
{
- int index = findFDIndex(fd);
- assert(index >= 0);
- debug(48, 3) ("IdleConnList::removeFD: found FD %d at index %d\n", fd, index);
+ if (index < 0 || index >= size_)
+ return false;
- for (; index < nfds - 1; index++)
- fds[index] = fds[index + 1];
+ // shuffle the remaining entries to fill the new gap.
+ for (; index < size_ - 1; index++)
+ theList_[index] = theList_[index + 1];
+ theList_[size_] = NULL;
- if (--nfds == 0) {
- debug(48, 3) ("IdleConnList::removeFD: deleting %s\n", hashKeyStr(&hash));
+ if (--size_ == 0) {
+ debugs(48, 3, HERE << "deleting " << hashKeyStr(&hash));
delete this;
}
+ return true;
}
void
-IdleConnList::clearHandlers(int fd)
+IdleConnList::clearHandlers(const Comm::ConnectionPointer &conn)
{
- comm_read_cancel(fd, IdleConnList::read, this);
- commSetTimeout(fd, -1, NULL, NULL);
+ comm_read_cancel(conn->fd, IdleConnList::Read, this);
+ commSetTimeout(conn->fd, -1, NULL, NULL);
}
void
-IdleConnList::push(int fd)
+IdleConnList::push(const Comm::ConnectionPointer &conn)
{
- if (nfds == nfds_alloc) {
- debug(48, 3) ("IdleConnList::push: growing FD array\n");
- nfds_alloc <<= 1;
- int *old = fds;
- fds = (int *)xmalloc(nfds_alloc * sizeof(int));
- xmemcpy(fds, old, nfds * sizeof(int));
-
- if (nfds == PCONN_FDS_SZ)
- pconn_fds_pool->free(old);
+ if (size_ == capacity_) {
+ debugs(48, 3, HERE << "growing idle Connection array");
+ capacity_ <<= 1;
+ const Comm::ConnectionPointer *oldList = theList_;
+ theList_ = new Comm::ConnectionPointer[capacity_];
+ for (int index = 0; index < size_; index++)
+ theList_[index] = oldList[index];
+
+/* TODO: re-attach to MemPools.
+ if (size_ == PCONN_FDS_SZ)
+ pconn_fds_pool->freeOne(oldList);
else
- xfree(old);
+*/
+ delete[] oldList;
}
- fds[nfds++] = fd;
- comm_read(fd, fakeReadBuf, sizeof(fakeReadBuf), IdleConnList::read, this);
- commSetTimeout(fd, Config.Timeout.pconn, IdleConnList::timeout, this);
+ theList_[size_++] = conn;
+ comm_read(conn, fakeReadBuf_, sizeof(fakeReadBuf_), IdleConnList::Read, this);
+ commSetTimeout(conn->fd, Config.Timeout.pconn, IdleConnList::Timeout, this);
}
/*
* of requests JUST as they timeout (say, it shuts down) we'll be wasting
* quite a bit of CPU. Just keep it in mind.
*/
-int
-IdleConnList::findUseableFD()
+Comm::ConnectionPointer
+IdleConnList::findUseable(const Comm::ConnectionPointer &key)
{
- assert(nfds);
+ assert(size_);
- for (int i = 0; i< nfds; i++) {
- if (!comm_has_pending_read_callback(fds[i])) {
- return fds[i];
- }
+ for (int i=size_-1; i>=0; i--) {
+
+ // callback pending indicates that remote end of the conn has just closed.
+ if (comm_has_pending_read_callback(theList_[i]->fd))
+ continue;
+
+ // local end port is required, but dont match.
+ if (key->local.GetPort() > 0 && key->local.GetPort() != theList_[i]->local.GetPort())
+ continue;
+
+ // local address is required, but does not match.
+ if (!key->local.IsAnyAddr() && key->local.matchIPAddr(theList_[i]->local) != 0)
+ continue;
+
+ // finally, a match. pop and return it.
+ Comm::ConnectionPointer result = theList_[i];
+ /* may delete this */
+ removeAt(i);
+ return result;
}
- return -1;
+ return Comm::ConnectionPointer();
}
void
-IdleConnList::read(int fd, char *buf, size_t len, comm_err_t flag, int xerrno, void *data)
+IdleConnList::Read(const Comm::ConnectionPointer &conn, char *buf, size_t len, comm_err_t flag, int xerrno, void *data)
{
- debug(48, 3) ("IdleConnList::read: %d bytes from FD %d\n", (int) len, fd);
+ debugs(48, 3, HERE << len << " bytes from " << conn);
if (flag == COMM_ERR_CLOSING) {
/* Bail out early on COMM_ERR_CLOSING - close handlers will tidy up for us */
}
IdleConnList *list = (IdleConnList *) data;
- list->removeFD(fd); /* might delete list */
- comm_close(fd);
+ int index = list->findIndexOf(conn);
+ if (index >= 0) {
+ /* might delete list */
+ list->removeAt(index);
+ conn->close();
+ }
}
void
-IdleConnList::timeout(int fd, void *data)
+IdleConnList::Timeout(int fd, void *data)
{
- debug(48, 3) ("IdleConnList::timeout: FD %d\n", fd);
+ debugs(48, 3, HERE << "FD " << fd);
IdleConnList *list = (IdleConnList *) data;
- list->removeFD(fd); /* might delete list */
- comm_close(fd);
+ Comm::ConnectionPointer temp = new Comm::Connection; // XXX: transition. make timeouts pass conn in
+ temp->fd = fd;
+ int index = list->findIndexOf(temp);
+ if (index >= 0) {
+ /* might delete list */
+ list->removeAt(index);
+ temp->close();
+ } else
+ temp->fd = -1; // XXX: transition. prevent temp erasure double-closing FD until timeout CB passess conn in.
}
/* ========== PconnPool PRIVATE FUNCTIONS ============================================ */
const char *
-PconnPool::key(const char *host, u_short port, const char *domain)
+PconnPool::key(const Comm::ConnectionPointer &destLink, const char *domain)
{
- LOCAL_ARRAY(char, buf, SQUIDHOSTNAMELEN * 2 + 10);
+ LOCAL_ARRAY(char, buf, SQUIDHOSTNAMELEN * 3 + 10);
- if (domain)
- snprintf(buf, SQUIDHOSTNAMELEN * 2 + 10, "%s:%d/%s", host, (int) port, domain);
- else
- snprintf(buf, SQUIDHOSTNAMELEN * 2 + 10, "%s:%d", host, (int) port);
+ destLink->remote.ToURL(buf, SQUIDHOSTNAMELEN * 3 + 10);
+ if (domain) {
+ const int used = strlen(buf);
+ snprintf(buf+used, SQUIDHOSTNAMELEN * 3 + 10-used, "/%s", domain);
+ }
+ debugs(48,6,"PconnPool::key(" << destLink << ", " << (domain?domain:"[no domain]") << ") is {" << buf << "}" );
return buf;
}
void
-PconnPool::dumpHist(StoreEntry * e)
+PconnPool::dumpHist(StoreEntry * e) const
{
- int i;
storeAppendPrintf(e,
"%s persistent connection counts:\n"
"\n"
"\t---- ---------\n",
descr);
- for (i = 0; i < PCONN_HIST_SZ; i++) {
+ for (int i = 0; i < PCONN_HIST_SZ; i++) {
if (hist[i] == 0)
continue;
}
}
+void
+PconnPool::dumpHash(StoreEntry *e) const
+{
+ hash_table *hid = table;
+ hash_first(hid);
+
+ int i = 0;
+ for (hash_link *walker = hid->next; walker; walker = hash_next(hid)) {
+ storeAppendPrintf(e, "\t item %5d: %s\n", i++, (char *)(walker->key));
+ }
+}
+
/* ========== PconnPool PUBLIC FUNCTIONS ============================================ */
PconnPool::PconnPool(const char *aDescr) : table(NULL), descr(aDescr)
{
- int i;
table = hash_create((HASHCMP *) strcmp, 229, hash_string);
- for (i = 0; i < PCONN_HIST_SZ; i++)
+ for (int i = 0; i < PCONN_HIST_SZ; i++)
hist[i] = 0;
- if (ThePconnModule == NULL)
- ThePconnModule = new PconnModule;
+ PconnModule::GetInstance()->add(this);
+}
- ThePconnModule->add
- (this);
+PconnPool::~PconnPool()
+{
+ descr = NULL;
+ hashFreeMemory(table);
}
void
-PconnPool::push(int fd, const char *host, u_short port, const char *domain)
+PconnPool::push(const Comm::ConnectionPointer &conn, const char *domain)
{
-
- IdleConnList *list;
- const char *aKey;
- LOCAL_ARRAY(char, desc, FD_DESC_SZ);
-
if (fdUsageHigh()) {
- debug(48, 3) ("PconnPool::push: Not many unused FDs\n");
- comm_close(fd);
+ debugs(48, 3, HERE << "Not many unused FDs");
+ conn->close();
return;
} else if (shutting_down) {
- comm_close(fd);
+ conn->close();
+ debugs(48, 3, HERE << "Squid is shutting down. Refusing to do anything");
return;
}
- aKey = key(host, port, domain);
-
- list = (IdleConnList *) hash_lookup(table, aKey);
+ const char *aKey = key(conn, domain);
+ IdleConnList *list = (IdleConnList *) hash_lookup(table, aKey);
if (list == NULL) {
list = new IdleConnList(aKey, this);
- debug(48, 3) ("pconnNew: adding %s\n", hashKeyStr(&list->hash));
+ debugs(48, 3, HERE << "new IdleConnList for {" << hashKeyStr(&list->hash) << "}" );
hash_join(table, &list->hash);
+ } else {
+ debugs(48, 3, HERE << "found IdleConnList for {" << hashKeyStr(&list->hash) << "}" );
}
- list->push(fd);
+ list->push(conn);
+ assert(!comm_has_incomplete_write(conn->fd));
- assert(!comm_has_incomplete_write(fd));
- snprintf(desc, FD_DESC_SZ, "%s idle connection", host);
- fd_note(fd, desc);
- debug(48, 3) ("PconnPool::push: pushed FD %d for %s\n", fd, aKey);
+ LOCAL_ARRAY(char, desc, FD_DESC_SZ);
+ snprintf(desc, FD_DESC_SZ, "Idle: %s", aKey);
+ fd_note(conn->fd, desc);
+ debugs(48, 3, HERE << "pushed " << conn << " for " << aKey);
}
-/*
- * return a pconn fd for host:port, or -1 if none are available
- */
-int
-PconnPool::pop(const char *host, u_short port, const char *domain)
+Comm::ConnectionPointer
+PconnPool::pop(const Comm::ConnectionPointer &destLink, const char *domain, bool isRetriable)
{
- IdleConnList *list;
- const char * aKey = key(host, port, domain);
- list = (IdleConnList *)hash_lookup(table, aKey);
+ const char * aKey = key(destLink, domain);
- if (list == NULL)
- return -1;
-
- int fd = list->findUseableFD();
-
- if (fd >= 0) {
- list->clearHandlers(fd);
- list->removeFD(fd); /* might delete list */
+ IdleConnList *list = (IdleConnList *)hash_lookup(table, aKey);
+ if (list == NULL) {
+ debugs(48, 3, HERE << "lookup for key {" << aKey << "} failed.");
+ return Comm::ConnectionPointer();
+ } else {
+ debugs(48, 3, HERE << "found " << hashKeyStr(&list->hash) << (isRetriable?"(to use)":"(to kill)") );
}
- return fd;
+ /* may delete list */
+ Comm::ConnectionPointer temp = list->findUseable(destLink);
+ if (Comm::IsConnOpen(temp) && !isRetriable)
+ temp->close();
+
+ return temp;
}
void
PconnModule::PconnModule() : pools(NULL), poolCount(0)
{
pools = (PconnPool **) xcalloc(MAX_NUM_PCONN_POOLS, sizeof(*pools));
- cachemgrRegister("pconn",
- "Persistent Connection Utilization Histograms",
- PconnModuleDumpWrapper, 0, 1);
- pconn_fds_pool = MemPools::GetInstance().create("pconn_fds", PCONN_FDS_SZ * sizeof(int));
- debug(48, 0) ("persistent connection module initialized\n");
+//TODO: re-link to MemPools. WAS: pconn_fds_pool = memPoolCreate("pconn_fds", PCONN_FDS_SZ * sizeof(int));
+ debugs(48, 0, "persistent connection module initialized");
+ registerWithCacheManager();
+}
+
+PconnModule *
+PconnModule::GetInstance()
+{
+ if (instance == NULL)
+ instance = new PconnModule;
+
+ return instance;
}
void
+PconnModule::registerWithCacheManager(void)
+{
+ Mgr::RegisterAction("pconn",
+ "Persistent Connection Utilization Histograms",
+ DumpWrapper, 0, 1);
+}
-PconnModule::add
- (PconnPool *aPool)
+void
+
+PconnModule::add(PconnPool *aPool)
{
assert(poolCount < MAX_NUM_PCONN_POOLS);
*(pools+poolCount) = aPool;
void
PconnModule::dump(StoreEntry *e)
{
- int i;
-
- for (i = 0; i < poolCount; i++) {
+ for (int i = 0; i < poolCount; i++) {
+ storeAppendPrintf(e, "\n Pool %d Stats\n", i);
(*(pools+i))->dumpHist(e);
+ storeAppendPrintf(e, "\n Pool %d Hash Table\n",i);
+ (*(pools+i))->dumpHash(e);
}
}
-static void
-PconnModuleDumpWrapper(StoreEntry *e)
+void
+PconnModule::DumpWrapper(StoreEntry *e)
{
- ThePconnModule->dump(e);
+ PconnModule::GetInstance()->dump(e);
}
projects / thirdparty / squid.git / blobdiff