diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-25 13:47:12 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-25 13:47:12 +0000 |
| commit | 79ea90be68675c0366173334b269f15f156e2dbf (patch) | |
| tree | 56952974f22a58aec2ca30d1ac4abe0d3d3f8bf5 /third_party/tcmalloc/chromium/src/heap-profiler.cc | |
| parent | 58a20f75ab7f1696586b3550c413f1ac1cbe23eb (diff) | |
| download | chromium_src-79ea90be68675c0366173334b269f15f156e2dbf.zip chromium_src-79ea90be68675c0366173334b269f15f156e2dbf.tar.gz chromium_src-79ea90be68675c0366173334b269f15f156e2dbf.tar.bz2 | |
Merge tcmalloc r93 into the Chromium tcmalloc branch.
We can't afford using r94 due to a performance regression.
TBR=willchan,antonm,jar,mbelshe
Review URL: http://codereview.chromium.org/2144003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48145 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/tcmalloc/chromium/src/heap-profiler.cc')
| -rw-r--r-- | third_party/tcmalloc/chromium/src/heap-profiler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/tcmalloc/chromium/src/heap-profiler.cc b/third_party/tcmalloc/chromium/src/heap-profiler.cc index a1c643a9..3055f4ce 100644 --- a/third_party/tcmalloc/chromium/src/heap-profiler.cc +++ b/third_party/tcmalloc/chromium/src/heap-profiler.cc @@ -524,9 +524,9 @@ extern "C" void HeapProfilerStart(const char* prefix) { filename_prefix[prefix_length] = '\0'; } -extern "C" bool IsHeapProfilerRunning() { +extern "C" int IsHeapProfilerRunning() { SpinLockHolder l(&heap_lock); - return is_on; + return is_on ? 1 : 0; // return an int, because C code doesn't have bool } extern "C" void HeapProfilerStop() { |