SourceFormat Enforcement

[thirdparty/squid.git] / src / DelayVector.cc

diff --git a/src/DelayVector.cc b/src/DelayVector.cc
index 882d88a4de18bb9873c4bd8fcedc16b01837777f..5bd1acb58e87981910443d26716f83facb800d5f 100644 (file)
--- a/src/DelayVector.cc
+++ b/src/DelayVector.cc
@@ -1,48 +1,19 @@
-
 /*
- * $Id: DelayVector.cc,v 1.5 2003/03/10 20:12:43 robertc Exp $
- *
- * DEBUG: section 77    Delay Pools
- * AUTHOR: Robert Collins <robertc@squid-cache.org>
- * Based upon original delay pools code by
- *   David Luyer <david@luyer.net>
- *
- * SQUID Web Proxy Cache          http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- *  Squid is the result of efforts by numerous individuals from
- *  the Internet community; see the CONTRIBUTORS file for full
- *  details.   Many organizations have provided support for Squid's
- *  development; see the SPONSORS file for full details.  Squid is
- *  Copyrighted (C) 2001 by the Regents of the University of
- *  California; see the COPYRIGHT file for full details.  Squid
- *  incorporates software developed and/or copyrighted by other
- *  sources; see the CREDITS file for full details.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  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.
- *
+ * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
  *
- * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
+ * 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 "config.h"
+/* DEBUG: section 77    Delay Pools */
 
-#if DELAY_POOLS
 #include "squid.h"
-#include "DelayVector.h"
+
+#if USE_DELAY_POOLS
+#include "comm/Connection.h"
 #include "CommRead.h"
+#include "DelayVector.h"
 
 void *
 DelayVector::operator new(size_t size)
@@ -58,14 +29,15 @@ DelayVector::operator delete (void *address)
     ::operator delete (address);
 }
 
-void
-DelayVector::deleteSelf() const
+DelayVector::DelayVector()
 {
-    delete this;
+    DelayPools::registerForUpdates (this);
 }
 
 DelayVector::~DelayVector()
-{}
+{
+    DelayPools::deregisterForUpdates (this);
+}
 
 void
 DelayVector::stats(StoreEntry * sentry)
@@ -92,12 +64,10 @@ DelayVector::dump(StoreEntry *entry) const
 void
 DelayVector::update(int incr)
 {
-    iterator pos = pools.begin();
-
-    while (pos != pools.end()) {
-        (*pos)->update(incr);
-        ++pos;
-    }
+    /*
+     * Each pool updates itself,
+     * but we may have deferred reads waiting on the pool as a whole.
+     */
 
     kickReads();
 }
@@ -114,10 +84,9 @@ DelayVector::parse()
 }
 
 DelayIdComposite::Pointer
-
-DelayVector::id(struct in_addr &src_addr, AuthUserRequest *authUser)
+DelayVector::id(CompositeSelectionDetails &details)
 {
-    return new Id(this, src_addr, authUser);
+    return new Id(this, details);
 }
 
 void
@@ -140,27 +109,20 @@ DelayVector::Id::operator delete (void *address)
     ::operator delete (address);
 }
 
-void
-DelayVector::Id::deleteSelf() const
+DelayVector::Id::Id(DelayVector::Pointer aDelayVector, CompositeSelectionDetails &details) : theVector(aDelayVector)
 {
-    delete this;
-}
-
-DelayVector::Id::Id(DelayVector::Pointer aDelayVector,struct in_addr &src_addr, AuthUserRequest *authUser) : theVector(aDelayVector)
-{
-    debug(77,3)("DelayVector::Id::Id\n");
+    debugs(77, 3, "DelayVector::Id::Id");
     DelayVector::iterator pos = theVector->pools.begin();
 
-    while (pos != theVector->pools.end())
-    {
-        ids.push_back ((*pos)->id (src_addr, authUser));
+    while (pos != theVector->pools.end()) {
+        ids.push_back ((*pos)->id (details));
         ++pos;
     }
 }
 
 DelayVector::Id::~Id()
 {
-    debug(77,3)("DelayVector::Id::~Id\n");
+    debugs(77, 3, "DelayVector::Id::~Id");
 }
 
 int
@@ -198,3 +160,4 @@ DelayVector::Id::delayRead(DeferredRead const &aRead)
 }
 
 #endif
+