summaryrefslogtreecommitdiffstats
path: root/base/debug/leak_annotations.h
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-21 07:34:50 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-21 07:34:50 +0000
commita1e13e3484dda35cc14cc61683e74b1d35ae6bb3 (patch)
tree625964282e8412c203fb0bbd2810ed294af853c4 /base/debug/leak_annotations.h
parent21dc3e4cd844b05ade0fb2b33d536255db3f6ec5 (diff)
downloadchromium_src-a1e13e3484dda35cc14cc61683e74b1d35ae6bb3.zip
chromium_src-a1e13e3484dda35cc14cc61683e74b1d35ae6bb3.tar.gz
chromium_src-a1e13e3484dda35cc14cc61683e74b1d35ae6bb3.tar.bz2
Introduce the ANNOTATE_LEAKING_OBJECT_PTR annotation that can be used to mark
heap allocated objects as intentionally leaked ones. Annotate the histograms produced by {Histogram,BooleanHistogram,LinearHistogram,CustomHistogram}::FactoryGet(), as leaked. Rename StatsHistogram::StatsHistogramFactoryGet to StatsHistogram::FactoryGet, annotate the result as leaky, update the suppressions. BUG=79322 Review URL: http://codereview.chromium.org/6869009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/debug/leak_annotations.h')
-rw-r--r--base/debug/leak_annotations.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/base/debug/leak_annotations.h b/base/debug/leak_annotations.h
index e1086fe..2d636f2 100644
--- a/base/debug/leak_annotations.h
+++ b/base/debug/leak_annotations.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -18,10 +18,22 @@
#define ANNOTATE_SCOPED_MEMORY_LEAK \
HeapLeakChecker::Disabler heap_leak_checker_disabler
+// Annotate an object pointer as referencing a leaky object. This object and all
+// the heap objects referenced by it will be ignored by the heap checker.
+//
+// X should be referencing an active allocated object. If it is not, the
+// annotation will be ignored.
+// No object should be annotated with ANNOTATE_SCOPED_MEMORY_LEAK twice.
+// Once an object is annotated with ANNOTATE_SCOPED_MEMORY_LEAK, it cannot be
+// deleted.
+#define ANNOTATE_LEAKING_OBJECT_PTR(X) \
+ HeapLeakChecker::IgnoreObject(X)
+
#else
// If tcmalloc is not used, the annotations should be no-ops.
#define ANNOTATE_SCOPED_MEMORY_LEAK
+#define ANNOTATE_LEAKING_OBJECT_PTR(X)
#endif