diff options
| author | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-26 17:56:57 +0000 |
|---|---|---|
| committer | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-26 17:56:57 +0000 |
| commit | 10ed6e2eb5e4453da40bdaddb69da73372de150c (patch) | |
| tree | d6f7dbfaa035b017f1552d089fa21d22a9f88a4a /base/debug | |
| parent | a506e8f0db3a685046f9163209837b221df0a201 (diff) | |
| download | chromium_src-10ed6e2eb5e4453da40bdaddb69da73372de150c.zip chromium_src-10ed6e2eb5e4453da40bdaddb69da73372de150c.tar.gz chromium_src-10ed6e2eb5e4453da40bdaddb69da73372de150c.tar.bz2 | |
Revert "Land http://codereview.chromium.org/6869009 for the third time."
This reverts commit d4ff483fbf60aad0b49fddd1937774edb3ba1d7e.
---
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.
---
TBR=glider@chromium.org
TEST=HistogramTest.RecordedStartupTest and WebSocketTest.ServerSentData in heapchecker bot wont hang.
BUG=79322
Review URL: http://codereview.chromium.org/6962016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86853 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/debug')
| -rw-r--r-- | base/debug/leak_annotations.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/base/debug/leak_annotations.h b/base/debug/leak_annotations.h index 2d636f2..e1086fe 100644 --- a/base/debug/leak_annotations.h +++ b/base/debug/leak_annotations.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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,22 +18,10 @@ #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 |