-
/*
- * $Id$
- *
- * DEBUG: section 77 Delay Pools
- * AUTHOR: Robert Collins <robertc@squid-cache.org>
- *
- * 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.
+ * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
*
- * 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 "squid.h"
-#include "DelayUser.h"
-#include "auth/UserRequest.h"
+
+#if USE_DELAY_POOLS && USE_AUTH
#include "auth/User.h"
+#include "auth/UserRequest.h"
+#include "comm/Connection.h"
+#include "DelayUser.h"
#include "NullDelayId.h"
#include "Store.h"
DelayPools::registerForUpdates (this);
}
-static SplayNode<DelayUserBucket::Pointer>::SPLAYFREE DelayUserFree;
+static Splay<DelayUserBucket::Pointer>::SPLAYFREE DelayUserFree;
DelayUser::~DelayUser()
{
DelayPools::deregisterForUpdates (this);
- buckets.head->destroy (DelayUserFree);
+ buckets.destroy(DelayUserFree);
}
-static SplayNode<DelayUserBucket::Pointer>::SPLAYCMP DelayUserCmp;
+static Splay<DelayUserBucket::Pointer>::SPLAYCMP DelayUserCmp;
int
DelayUserCmp(DelayUserBucket::Pointer const &left, DelayUserBucket::Pointer const &right)
{
+ /* Verify for re-currance of Bug 2127. either of these missing will crash strcasecmp() */
+ assert(left->authUser->username() != NULL);
+ assert(right->authUser->username() != NULL);
+
/* for rate limiting, case insensitive */
return strcasecmp(left->authUser->username(), right->authUser->username());
}
current->stats ((StoreEntry *)state);
}
+struct DelayUserStatsVisitor {
+ StoreEntry *se;
+ explicit DelayUserStatsVisitor(StoreEntry *s) : se(s) {}
+ void operator() (DelayUserBucket::Pointer const ¤t) {
+ current->stats(se);
+ }
+};
+
void
DelayUser::stats(StoreEntry * sentry)
{
storeAppendPrintf(sentry, "\t\tCurrent: ");
- if (!buckets.head) {
+ if (buckets.empty()) {
storeAppendPrintf (sentry, "Not used yet.\n\n");
return;
}
- buckets.head->walk(DelayUserStatsWalkee, sentry);
+ DelayUserStatsVisitor visitor(sentry);
+ buckets.visit(visitor);
storeAppendPrintf(sentry, "\n\n");
}
const_cast<DelayUserBucket *>(current.getRaw())->theBucket.update(t->spec, t->incr);
}
+struct DelayUserUpdateVisitor {
+ DelayUserUpdater *t;
+ DelayUserUpdateVisitor(DelayUserUpdater *updater) : t(updater) {}
+ void operator() (DelayUserBucket::Pointer const ¤t) {
+ const_cast<DelayUserBucket *>(current.getRaw())->theBucket.update(t->spec, t->incr);
+ }
+};
+
void
DelayUser::update(int incr)
{
DelayUserUpdater updater(spec, incr);
- buckets.head->walk (DelayUserUpdateWalkee, &updater);
+ DelayUserUpdateVisitor visitor(&updater);
+ buckets.visit(visitor);
}
void
DelayIdComposite::Pointer
DelayUser::id(CompositePoolNode::CompositeSelectionDetails &details)
{
- if (!details.user)
+ if (!details.user || !details.user->user() || !details.user->user()->username())
return new NullDelayId;
+ debugs(77, 3, HERE << "Adding a slow-down for User '" << details.user->user()->username() << "'");
return new Id(this, details.user->user());
}
}
void
-DelayUserBucket::operator delete (void *address)
+DelayUserBucket::operator delete(void *address)
{
- DelayPools::MemoryUsed -= sizeof (DelayUserBucket);
- ::operator delete (address);
+ DelayPools::MemoryUsed -= sizeof(DelayUserBucket);
+ ::operator delete(address);
}
-DelayUserBucket::DelayUserBucket(AuthUser *aUser) : authUser (aUser)
+DelayUserBucket::DelayUserBucket(Auth::User::Pointer aUser) : authUser(aUser)
{
debugs(77, 3, "DelayUserBucket::DelayUserBucket");
-
- authUser->lock();
}
DelayUserBucket::~DelayUserBucket()
{
- authUser->unlock();
+ authUser = NULL;
debugs(77, 3, "DelayUserBucket::~DelayUserBucket");
}
DelayUserBucket::stats (StoreEntry *entry) const
{
storeAppendPrintf(entry, " %s:", authUser->username());
- theBucket.stats (entry);
+ theBucket.stats(entry);
}
-DelayUser::Id::Id(DelayUser::Pointer aDelayUser,AuthUser *aUser) : theUser(aDelayUser)
+DelayUser::Id::Id(DelayUser::Pointer aDelayUser, Auth::User::Pointer aUser) : theUser(aDelayUser)
{
theBucket = new DelayUserBucket(aUser);
DelayUserBucket::Pointer const *existing = theUser->buckets.find(theBucket, DelayUserCmp);
}
theBucket->theBucket.init(theUser->spec);
- theUser->buckets.head = theUser->buckets.head->insert (theBucket, DelayUserCmp);
+ theUser->buckets.insert (theBucket, DelayUserCmp);
}
DelayUser::Id::~Id()
theBucket->theBucket.bytesIn(qty);
}
-#endif
+#endif /* USE_DELAY_POOLS && USE_AUTH */
+
projects / thirdparty / squid.git / blobdiff