third_party/tcmalloc/chromium/src/base/low_level_alloc.cc - Issue 9666033: Experiment for updating the tcmalloc chromium branch to r144 (gperftools 2.0).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/tcmalloc/chromium/src/base/low_level_alloc.cc

Issue 9666033: Experiment for updating the tcmalloc chromium branch to r144 (gperftools 2.0). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/tcmalloc/chromium/src/base/logging.h ('k') | third_party/tcmalloc/chromium/src/base/spinlock_internal.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/tcmalloc/chromium/src/base/low_level_alloc.cc

diff --git a/third_party/tcmalloc/chromium/src/base/low_level_alloc.cc b/third_party/tcmalloc/chromium/src/base/low_level_alloc.cc

index 532c594a441f7bab27e4dbeca45ccd70170b5102..c043cb68b6ea4dd8c131771d79883c789e93beff 100644

--- a/third_party/tcmalloc/chromium/src/base/low_level_alloc.cc

+++ b/third_party/tcmalloc/chromium/src/base/low_level_alloc.cc

@@ -38,7 +38,7 @@

#include "base/spinlock.h"

#include "base/logging.h"

#include "malloc_hook-inl.h"

-#include <google/malloc_hook.h>

+#include <gperftools/malloc_hook.h>

#include <errno.h>

#ifdef HAVE_UNISTD_H

#include <unistd.h>

@@ -233,7 +233,7 @@ namespace {

this->arena_->mu.Lock();

}

~ArenaLock() { RAW_CHECK(this->left_, "haven't left Arena region"); }

- void Leave() UNLOCK_FUNCTION() {

+ void Leave() /*UNLOCK_FUNCTION()*/ {

this->arena_->mu.Unlock();

#if 0

if (this->mask_valid_) {

« no previous file with comments | « third_party/tcmalloc/chromium/src/base/logging.h ('k') | third_party/tcmalloc/chromium/src/base/spinlock_internal.cc » ('j') | no next file with comments »