Source Format Enforcement (#532)

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

diff --git a/src/LeakFinder.cc b/src/LeakFinder.cc
index e8a86a749f1f6c2fcb07b255b52cece89da1fed7..92a30729d170be62b207af57a7c84201151c1da0 100644 (file)
--- a/src/LeakFinder.cc
+++ b/src/LeakFinder.cc
@@ -1,60 +1,42 @@
-
 /*
- * $Id: LeakFinder.cc,v 1.6 2007/04/30 16:56:09 wessels Exp $
- *
- * DEBUG: section 45    Callback Data Registry
- * AUTHOR: Duane Wessels
- *
- * 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-2020 The Squid Software Foundation and contributors
  *
+ * 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 45    Callback Data Registry */
+
 /*
  * Use these to find memory leaks
  */
 
 #include "squid.h"
+
+#if USE_LEAKFINDER
+
 #include "LeakFinder.h"
-#include "Store.h"
 #include "SquidTime.h"
+#include "Store.h"
 
-#if USE_LEAKFINDER
 /* ========================================================================= */
 
-LeakFinderPtr::LeakFinderPtr(void *p , const char *f, const int l) :
-        file(f), line(l), when(squid_curtime)
+LeakFinderPtr::LeakFinderPtr(void *p, const char *f, const int l) :
+    file(f),
+    line(l),
+    when(squid_curtime)
 {
+    // XXX: these bits should be done by hash_link()
     key = p;
     next = NULL;
 }
 
 /* ========================================================================= */
 
-LeakFinder::LeakFinder()
+LeakFinder::LeakFinder() :
+    count(0),
+    last_dump(0)
 {
     debugs(45, 3, "LeakFinder constructed");
     table = hash_create(cmp, 1 << 8, hash);
@@ -69,14 +51,12 @@ LeakFinder::LeakFinder()
 }
 
 void *
-
-LeakFinder::add
-(void *p, const char *file, int line)
+LeakFinder::addSome(void *p, const char *file, int line)
 {
     assert(hash_lookup(table, p) == NULL);
     LeakFinderPtr *c = new LeakFinderPtr(p, file, line);
     hash_join(table, c);
-    count++;
+    ++count;
     return p;
 }
 
@@ -93,13 +73,13 @@ LeakFinder::touch(void *p, const char *file, int line)
 }
 
 void *
-LeakFinder::free(void *p, const char *file, int line)
+LeakFinder::freeSome(void *p, const char *file, int line)
 {
     assert(p);
     LeakFinderPtr *c = (LeakFinderPtr *) hash_lookup(table, p);
     assert(c);
     hash_remove_link(table, c);
-    count--;
+    --count;
     delete c;
     dump();
     return p;
@@ -119,7 +99,6 @@ LeakFinder::hash(const void *p, unsigned int mod)
     return ((unsigned long) p >> 8) % mod;
 }
 
-
 void
 LeakFinder::dump()
 {
@@ -131,16 +110,17 @@ LeakFinder::dump()
 
     last_dump = squid_curtime;
 
-    debugs(45, 1, "Tracking " << count << " pointers");
+    debugs(45, DBG_IMPORTANT, "Tracking " << count << " pointers");
 
     hash_first(table);
 
     LeakFinderPtr *c;
 
     while ((c = (LeakFinderPtr *)hash_next(table))) {
-        debugs(45, 1, std::setw(20) << c->key << " last used " << std::setw(9) << (squid_curtime - c->when) <<
+        debugs(45, DBG_IMPORTANT, std::setw(20) << c->key << " last used " << std::setw(9) << (squid_curtime - c->when) <<
                " seconds ago by " << c->file << ":" << c->line);
     }
 }
 
 #endif /* USE_LEAKFINDER */
+