summaryrefslogtreecommitdiffstats
path: root/third_party/tcmalloc
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-22 04:35:03 +0000
committercevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-22 04:35:03 +0000
commit6b635aaf9bb802befcdc6ddb9268bc2f9435c59f (patch)
tree44a204675b6587b6b5ce213c21f3aa481db1b656 /third_party/tcmalloc
parent92d5d525fc362abbf882d045261373a17798c043 (diff)
downloadchromium_src-6b635aaf9bb802befcdc6ddb9268bc2f9435c59f.zip
chromium_src-6b635aaf9bb802befcdc6ddb9268bc2f9435c59f.tar.gz
chromium_src-6b635aaf9bb802befcdc6ddb9268bc2f9435c59f.tar.bz2
Fix missing name in tcmalloc error message (to be reverted immediately).
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/tcmalloc')
-rw-r--r--third_party/tcmalloc/chromium/src/system-alloc.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/third_party/tcmalloc/chromium/src/system-alloc.cc b/third_party/tcmalloc/chromium/src/system-alloc.cc
index 5053981..f5aa0a0 100644
--- a/third_party/tcmalloc/chromium/src/system-alloc.cc
+++ b/third_party/tcmalloc/chromium/src/system-alloc.cc
@@ -160,6 +160,7 @@ class DefaultSysAllocator : public SysAllocator {
for (int i = 0; i < kMaxAllocators; i++) {
failed_[i] = true;
allocs_[i] = NULL;
+ names_[i] = NULL;
}
}
void SetChildAllocator(SysAllocator* alloc, unsigned int index,
@@ -167,6 +168,7 @@ class DefaultSysAllocator : public SysAllocator {
if (index < kMaxAllocators && alloc != NULL) {
allocs_[index] = alloc;
failed_[index] = false;
+ names_[index] = name;
}
}
void* Alloc(size_t size, size_t *actual_size, size_t alignment);