Source Format Enforcement (#1234)

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

diff --git a/src/DelayPool.cc b/src/DelayPool.cc
index 45b3096bec6a4f889a12071a241ded5572a57468..14b57fb705e2c708db0ffa70a894342e222efaa0 100644 (file)
--- a/src/DelayPool.cc
+++ b/src/DelayPool.cc
@@ -1,50 +1,23 @@
 /*
- * $Id$
+ * Copyright (C) 1996-2023 The Squid Software Foundation and contributors
  *
- * 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) 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 "DelayPool.h"
+#include "squid.h"
+
+#if USE_DELAY_POOLS
+#include "acl/Acl.h"
+#include "acl/Gadgets.h"
 #include "CommonPool.h"
-#include "ACL.h"
+#include "DelayPool.h"
 #include "Store.h"
 
-DelayPool::DelayPool() : pool (NULL), access (NULL)
+DelayPool::DelayPool() : pool (nullptr), access (nullptr)
 {
     pool = CommonPool::Factory(0, theComposite_);
 }
@@ -61,14 +34,14 @@ DelayPool::~DelayPool()
 void
 DelayPool::parse()
 {
-    assert(theComposite() != NULL);
+    assert(theComposite() != nullptr);
     theComposite()->parse();
 }
 
 void
 DelayPool::dump(StoreEntry *entry, unsigned int i) const
 {
-    if (theComposite() == NULL)
+    if (theComposite() == nullptr)
         return;
 
     storeAppendPrintf(entry, "delay_class %d %s\n", i + 1, pool->theClassTypeLabel());
@@ -99,14 +72,14 @@ void
 DelayPool::freeData()
 {
     delete pool;
-    pool = NULL;
+    pool = nullptr;
 }
 
-/** \todo XXX create DelayIdComposite.cc */
+// TODO: create DelayIdComposite.cc
 void
-CompositePoolNode::delayRead(DeferredRead const &aRead)
+CompositePoolNode::delayRead(const AsyncCall::Pointer &aRead)
 {
-    deferredReads.delayRead(aRead);
+    deferredReads.delay(aRead);
 }
 
 #include "comm.h"
@@ -114,7 +87,8 @@ CompositePoolNode::delayRead(DeferredRead const &aRead)
 void
 CompositePoolNode::kickReads()
 {
-    deferredReads.kickReads(-1);
+    deferredReads.schedule();
 }
 
-#endif
+#endif /* USE_DELAY_POOLS */
+