/*
- * DEBUG: section 77 Delay Pools
- * AUTHOR: Robert Collins <robertc@squid-cache.org>
- * Based upon original delay pools code by
- * David Luyer <david@luyer.net>
+ * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
*
- * 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.
*/
+/* DEBUG: section 77 Delay Pools */
+
/**
\defgroup DelayPoolsInternal Delay Pools Internal
\ingroup DelayPoolsAPI
*/
-#include "config.h"
-
-#if DELAY_POOLS
#include "squid.h"
-#include "CacheManager.h"
-#include "DelaySpec.h"
-#include "DelayPools.h"
-#include "event.h"
-#include "StoreClient.h"
-#include "Store.h"
-#include "MemObject.h"
+
+#if USE_DELAY_POOLS
#include "client_side_request.h"
-#include "ConfigParser.h"
-#include "DelayId.h"
-#include "Array.h"
-#include "SquidString.h"
-#include "SquidTime.h"
+#include "comm/Connection.h"
#include "CommonPool.h"
#include "CompositePoolNode.h"
+#include "ConfigParser.h"
+#include "DelayBucket.h"
+#include "DelayId.h"
#include "DelayPool.h"
+#include "DelayPools.h"
+#include "DelaySpec.h"
+#include "DelayTagged.h"
+#include "DelayUser.h"
#include "DelayVector.h"
+#include "event.h"
+#include "http/Stream.h"
+#include "ip/Address.h"
+#include "MemObject.h"
+#include "mgr/Registration.h"
#include "NullDelayId.h"
-#include "DelayBucket.h"
-#include "DelayUser.h"
-#include "DelayTagged.h"
-#include "ip/IpAddress.h"
-
-/// \ingroup DelayPoolsInternal
-long DelayPools::MemoryUsed = 0;
+#include "SquidString.h"
+#include "SquidTime.h"
+#include "Store.h"
+#include "StoreClient.h"
/// \ingroup DelayPoolsInternal
class Aggregate : public CompositePoolNode
{
+ MEMPROXY_CLASS(Aggregate);
public:
typedef RefCount<Aggregate> Pointer;
- void *operator new(size_t);
- void operator delete (void *);
Aggregate();
~Aggregate();
virtual DelaySpec *rate() {return &spec;}
/// \ingroup DelayPoolsInternal
class AggregateId:public DelayIdComposite
{
+ MEMPROXY_CLASS(Aggregate::AggregateId);
public:
- void *operator new(size_t);
- void operator delete (void *);
AggregateId (RefCount<Aggregate>);
virtual int bytesWanted (int min, int max) const;
virtual void bytesIn(int qty);
/// \ingroup DelayPoolsInternal
class VectorPool : public CompositePoolNode
{
+ MEMPROXY_CLASS(VectorPool);
public:
typedef RefCount<VectorPool> Pointer;
virtual char const *label() const = 0;
- virtual unsigned int makeKey (IpAddress &src_addr) const = 0;
+ virtual unsigned int makeKey(Ip::Address &src_addr) const = 0;
DelaySpec spec;
/// \ingroup DelayPoolsInternal
class Id:public DelayIdComposite
{
+ MEMPROXY_CLASS(VectorPool::Id);
public:
- void *operator new(size_t);
- void operator delete (void *);
Id (RefCount<VectorPool>, int);
virtual int bytesWanted (int min, int max) const;
virtual void bytesIn(int qty);
/// \ingroup DelayPoolsInternal
class IndividualPool : public VectorPool
{
-
-public:
- void *operator new(size_t);
- void operator delete (void *);
+ MEMPROXY_CLASS(IndividualPool);
protected:
virtual char const *label() const {return "Individual";}
-
- virtual unsigned int makeKey (IpAddress &src_addr) const;
-
+ virtual unsigned int makeKey(Ip::Address &src_addr) const;
};
/// \ingroup DelayPoolsInternal
class ClassCNetPool : public VectorPool
{
-
-public:
- void *operator new(size_t);
- void operator delete (void *);
+ MEMPROXY_CLASS(ClassCNetPool);
protected:
virtual char const *label() const {return "Network";}
-
- virtual unsigned int makeKey (IpAddress &src_addr) const;
+ virtual unsigned int makeKey (Ip::Address &src_addr) const;
};
/* don't use remote storage for these */
/// \ingroup DelayPoolsInternal
class ClassCHostPool : public CompositePoolNode
{
+ MEMPROXY_CLASS(ClassCHostPool);
public:
typedef RefCount<ClassCHostPool> Pointer;
virtual char const *label() const {return "Individual";}
- virtual unsigned int makeKey (IpAddress &src_addr) const;
+ virtual unsigned int makeKey(Ip::Address &src_addr) const;
- unsigned char makeHostKey (IpAddress &src_addr) const;
+ unsigned char makeHostKey(Ip::Address &src_addr) const;
DelaySpec spec;
VectorMap<unsigned char, ClassCBucket> buckets;
/// \ingroup DelayPoolsInternal
class Id:public DelayIdComposite
{
+ MEMPROXY_CLASS(ClassCHostPool::Id);
public:
- void *operator new(size_t);
- void operator delete (void *);
Id (RefCount<ClassCHostPool>, unsigned char, unsigned char);
virtual int bytesWanted (int min, int max) const;
virtual void bytesIn(int qty);
theAggregate->delayRead(aRead);
}
-void *
-CommonPool::operator new(size_t size)
-{
- DelayPools::MemoryUsed += sizeof (CommonPool);
- return ::operator new (size);
-}
-
-void
-CommonPool::operator delete (void *address)
-{
- DelayPools::MemoryUsed -= sizeof (CommonPool);
- ::operator delete (address);
-}
-
CommonPool *
CommonPool::Factory(unsigned char _class, CompositePoolNode::Pointer& compositeCopy)
{
temp->push_back (new Aggregate);
temp->push_back(new IndividualPool);
}
-
break;
case 3:
temp->push_back (new ClassCNetPool);
temp->push_back (new ClassCHostPool);
}
-
break;
case 4:
temp->push_back (new Aggregate);
temp->push_back (new ClassCNetPool);
temp->push_back (new ClassCHostPool);
+#if USE_AUTH
temp->push_back (new DelayUser);
+#endif
}
-
break;
case 5:
/* If we aren't active, don't try to update us ! */
assert (rate.restore_bps != -1);
- for (unsigned char j = 0; j < individuals.size(); ++j)
+ for (unsigned int j = 0; j < individuals.size(); ++j)
individuals.values[j].update (rate, incr);
}
individuals.values[newIndex].init (rate);
}
-void *
-CompositePoolNode::operator new(size_t size)
-{
- DelayPools::MemoryUsed += sizeof (CompositePoolNode);
- return ::operator new (size);
-}
-
-void
-CompositePoolNode::operator delete (void *address)
-{
- DelayPools::MemoryUsed -= sizeof (CompositePoolNode);
- ::operator delete (address);
-}
-
-void *
-Aggregate::operator new(size_t size)
-{
- DelayPools::MemoryUsed += sizeof (Aggregate);
- return ::operator new (size);
-}
-
-void
-Aggregate::operator delete (void *address)
-{
- DelayPools::MemoryUsed -= sizeof (Aggregate);
- ::operator delete (address);
-}
-
Aggregate::Aggregate()
{
theBucket.init (*rate());
}
DelayIdComposite::Pointer
-
Aggregate::id(CompositeSelectionDetails &details)
{
if (rate()->restore_bps != -1)
return new NullDelayId;
}
-void *
-Aggregate::AggregateId::operator new(size_t size)
-{
- DelayPools::MemoryUsed += sizeof (AggregateId);
- return ::operator new (size);
-}
-
-void
-Aggregate::AggregateId::operator delete (void *address)
-{
- DelayPools::MemoryUsed -= sizeof (AggregateId);
- ::operator delete (address);
-}
-
Aggregate::AggregateId::AggregateId(RefCount<Aggregate> anAggregate) : theAggregate(anAggregate)
{}
void
DelayPools::RegisterWithCacheManager(void)
{
- CacheManager::GetInstance()->
- registerAction("delay", "Delay Pool Levels", Stats, 0, 1);
+ Mgr::RegisterAction("delay", "Delay Pool Levels", Stats, 0, 1);
}
void
RegisterWithCacheManager();
}
-
void
DelayPools::InitDelayData()
{
DelayPools::delay_data = new DelayPool[pools()];
- DelayPools::MemoryUsed += pools() * sizeof(DelayPool);
-
eventAdd("DelayPools::Update", DelayPools::Update, NULL, 1.0, 1);
}
{
eventDelete(DelayPools::Update, NULL);
delete[] DelayPools::delay_data;
- DelayPools::MemoryUsed -= pools() * sizeof(*DelayPools::delay_data);
pools_ = 0;
}
LastUpdate = squid_curtime;
- Vector<Updateable *>::iterator pos = toUpdate.begin();
+ std::vector<Updateable *>::iterator pos = toUpdate.begin();
while (pos != toUpdate.end()) {
(*pos)->update(incr);
void
DelayPools::deregisterForUpdates (Updateable *anObject)
{
- Vector<Updateable *>::iterator pos = toUpdate.begin();
+ std::vector<Updateable *>::iterator pos = toUpdate.begin();
while (pos != toUpdate.end() && *pos != anObject) {
++pos;
if (pos != toUpdate.end()) {
/* move all objects down one */
- Vector<Updateable *>::iterator temp = pos;
+ std::vector<Updateable *>::iterator temp = pos;
++pos;
while (pos != toUpdate.end()) {
}
}
-Vector<Updateable *> DelayPools::toUpdate;
+std::vector<Updateable *> DelayPools::toUpdate;
void
DelayPools::Stats(StoreEntry * sentry)
{
- unsigned short i;
-
storeAppendPrintf(sentry, "Delay pools configured: %d\n\n", DelayPools::pools());
- for (i = 0; i < DelayPools::pools(); ++i) {
+ for (unsigned short i = 0; i < DelayPools::pools(); ++i) {
if (DelayPools::delay_data[i].theComposite().getRaw()) {
storeAppendPrintf(sentry, "Pool: %d\n\tClass: %s\n\n", i + 1, DelayPools::delay_data[i].pool->theClassTypeLabel());
DelayPools::delay_data[i].theComposite()->stats (sentry);
} else
storeAppendPrintf(sentry, "\tMisconfigured pool.\n\n");
}
-
- storeAppendPrintf(sentry, "Memory Used: %d bytes\n", (int) DelayPools::MemoryUsed);
}
void
}
void
-DelayPools::pools (u_short newPools)
+DelayPools::pools(unsigned short newPools)
{
if (pools()) {
- debugs(3, 0, "parse_delay_pool_count: multiple delay_pools lines, aborting all previous delay_pools config");
+ debugs(3, DBG_CRITICAL, "parse_delay_pool_count: multiple delay_pools lines, aborting all previous delay_pools config");
FreePools();
}
return index;
}
-void *
-IndividualPool::operator new(size_t size)
-{
- DelayPools::MemoryUsed += sizeof (IndividualPool);
- return ::operator new (size);
-}
-
-void
-IndividualPool::operator delete (void *address)
-{
- DelayPools::MemoryUsed -= sizeof (IndividualPool);
- ::operator delete (address);
-}
-
VectorPool::VectorPool()
{
DelayPools::registerForUpdates (this);
storeAppendPrintf(sentry, "\t\tCurrent:");
- for (unsigned int i = 0; i < buckets.size(); i++) {
+ for (unsigned int i = 0; i < buckets.size(); ++i) {
storeAppendPrintf(sentry, " %d:", buckets.key_map[i]);
buckets.values[i].stats(sentry);
}
VectorMap<Key,Value>::findKeyIndex (Key const key) const
{
for (unsigned int index = 0; index < size(); ++index) {
- assert (indexUsed (index));
+ assert(indexUsed(index));
if (key_map[index] == key)
return index;
}
DelayIdComposite::Pointer
-
VectorPool::id(CompositeSelectionDetails &details)
{
if (rate()->restore_bps == -1)
return new NullDelayId;
- unsigned int key = makeKey (details.src_addr);
+ /* non-IPv4 are not able to provide IPv4-bitmask for this pool type key. */
+ if ( !details.src_addr.isIPv4() )
+ return new NullDelayId;
- if (keyAllocated (key))
- return new Id (this, buckets.findKeyIndex(key));
+ unsigned int key = makeKey(details.src_addr);
+
+ if (keyAllocated(key))
+ return new Id(this, buckets.findKeyIndex(key));
unsigned char const resultIndex = buckets.insert(key);
- buckets.values[resultIndex].init (*rate());
+ buckets.values[resultIndex].init(*rate());
return new Id(this, resultIndex);
}
-void *
-VectorPool::Id::operator new(size_t size)
-{
- DelayPools::MemoryUsed += sizeof (Id);
- return ::operator new (size);
-}
-
-void
-VectorPool::Id::operator delete (void *address)
-{
- DelayPools::MemoryUsed -= sizeof (Id);
- ::operator delete (address);
-}
-
-VectorPool::Id::Id (VectorPool::Pointer aPool, int anIndex) : theVector (aPool), theIndex (anIndex)
+VectorPool::Id::Id(VectorPool::Pointer aPool, int anIndex) : theVector (aPool), theIndex (anIndex)
{}
int
}
unsigned int
-IndividualPool::makeKey (IpAddress &src_addr) const
+IndividualPool::makeKey(Ip::Address &src_addr) const
{
- /* FIXME INET6 : IPv6 requires a 64-128 bit result from this function */
- if ( !src_addr.IsIPv4() )
+ /* IPv4 required for this pool */
+ if ( !src_addr.isIPv4() )
return 1;
- /* Temporary bypass for IPv4-only */
struct in_addr host;
- src_addr.GetInAddr(host);
+ src_addr.getInAddr(host);
return (ntohl(host.s_addr) & 0xff);
}
-void *
-ClassCNetPool::operator new(size_t size)
-{
- DelayPools::MemoryUsed += sizeof (ClassCNetPool);
- return ::operator new (size);
-}
-
-void
-ClassCNetPool::operator delete (void *address)
-{
- DelayPools::MemoryUsed -= sizeof (ClassCNetPool);
- ::operator delete (address);
-}
-
unsigned int
-ClassCNetPool::makeKey (IpAddress &src_addr) const
+ClassCNetPool::makeKey(Ip::Address &src_addr) const
{
- /* FIXME INET6 : IPv6 requires a 64-128 bit result from this function */
- if ( !src_addr.IsIPv4() )
+ /* IPv4 required for this pool */
+ if ( !src_addr.isIPv4() )
return 1;
- /* Temporary bypass for IPv4-only */
struct in_addr net;
- src_addr.GetInAddr(net);
+ src_addr.getInAddr(net);
return ( (ntohl(net.s_addr) >> 8) & 0xff);
}
-
ClassCHostPool::ClassCHostPool()
{
DelayPools::registerForUpdates (this);
}
unsigned char
-ClassCHostPool::makeHostKey (IpAddress &src_addr) const
+ClassCHostPool::makeHostKey(Ip::Address &src_addr) const
{
- /* FIXME INET6 : IPv6 requires a 64-128 bit result from this function */
- if ( !src_addr.IsIPv4() )
+ /* IPv4 required for this pool */
+ if ( !src_addr.isIPv4() )
return 1;
/* Temporary bypass for IPv4-only */
struct in_addr host;
- src_addr.GetInAddr(host);
+ src_addr.getInAddr(host);
return (ntohl(host.s_addr) & 0xff);
}
unsigned int
-ClassCHostPool::makeKey (IpAddress &src_addr) const
+ClassCHostPool::makeKey(Ip::Address &src_addr) const
{
- /* FIXME INET6 : IPv6 requires a 64-128 bit result from this function */
- if ( !src_addr.IsIPv4() )
+ /* IPv4 required for this pool */
+ if ( !src_addr.isIPv4() )
return 1;
- /* Temporary bypass for IPv4-only */
struct in_addr net;
- src_addr.GetInAddr(net);
+ src_addr.getInAddr(net);
return ( (ntohl(net.s_addr) >> 8) & 0xff);
}
DelayIdComposite::Pointer
-
ClassCHostPool::id(CompositeSelectionDetails &details)
{
if (rate()->restore_bps == -1)
return new NullDelayId;
+ /* non-IPv4 are not able to provide IPv4-bitmask for this pool type key. */
+ if ( !details.src_addr.isIPv4() )
+ return new NullDelayId;
+
unsigned int key = makeKey (details.src_addr);
unsigned char host = makeHostKey (details.src_addr);
return new Id (this, netIndex, hostIndex);
}
-void *
-ClassCHostPool::Id::operator new(size_t size)
-{
- DelayPools::MemoryUsed += sizeof (Id);
- return ::operator new (size);
-}
-
-void
-ClassCHostPool::Id::operator delete (void *address)
-{
- DelayPools::MemoryUsed -= sizeof (Id);
- ::operator delete (address);
-}
-
ClassCHostPool::Id::Id (ClassCHostPool::Pointer aPool, unsigned char aNet, unsigned char aHost) : theClassCHost (aPool), theNet (aNet), theHost (aHost)
{}
theClassCHost->buckets.values[theNet].individuals.values[theHost].bytesIn (qty);
}
-#endif
+#endif /* USE_DELAY_POOLS */
projects / thirdparty / squid.git / blobdiff