diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 20:34:45 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 20:34:45 +0000 |
| commit | fec7a61365df532b3bf016bc85b454692f327553 (patch) | |
| tree | f9c66a8d2658a72740918fff8ca81c2ddefb3768 /third_party/tcmalloc | |
| parent | 2b49f843331d488fec214b27765812b32ee6ebb9 (diff) | |
| download | chromium_src-fec7a61365df532b3bf016bc85b454692f327553.zip chromium_src-fec7a61365df532b3bf016bc85b454692f327553.tar.gz chromium_src-fec7a61365df532b3bf016bc85b454692f327553.tar.bz2 | |
Reverting this to see if it fixes the redness on the ChromiumOS bots.
Revert 150135 - Enable memory profiler on Linux when TC_MALLOC is enabled.
Added a tc_malloc memory extension to get bytes allocated on
current thread (GetBytesAllocatedOnCurrentThread API call).
R=jam@chromium.org,jar@chromium.org
BUG=139667
TEST=test about:profiler after setting the env variable
CHROME_PROFILER_TIME=1. In about:profiler, it will
show the memory allocated per thread. This change
impacts linux only.
Review URL: https://chromiumcodereview.appspot.com/10820063
TBR=rtenneti@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10855010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150142 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/tcmalloc')
| -rw-r--r-- | third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h | 6 | ||||
| -rw-r--r-- | third_party/tcmalloc/chromium/src/malloc_extension.cc | 7 |
2 files changed, 2 insertions, 11 deletions
diff --git a/third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h b/third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h index 950b603..5bee019 100644 --- a/third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h +++ b/third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012, Google Inc. +// Copyright (c) 2005, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -307,10 +307,6 @@ class PERFTOOLS_DLL_DECL MallocExtension { // malloc implementation during initialization. static void Register(MallocExtension* implementation); - // On the current thread, return the total number of bytes allocated. - // (Currently only implemented in tcmalloc.) - static unsigned int GetBytesAllocatedOnCurrentThread(); - // Returns detailed information about malloc's freelists. For each list, // return a FreeListInfo: struct FreeListInfo { diff --git a/third_party/tcmalloc/chromium/src/malloc_extension.cc b/third_party/tcmalloc/chromium/src/malloc_extension.cc index fb30d39..2d6497f 100644 --- a/third_party/tcmalloc/chromium/src/malloc_extension.cc +++ b/third_party/tcmalloc/chromium/src/malloc_extension.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012, Google Inc. +// Copyright (c) 2005, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -50,7 +50,6 @@ #include "gperftools/malloc_extension.h" #include "gperftools/malloc_extension_c.h" #include "maybe_threads.h" -#include "thread_cache.h" using STL_NAMESPACE::string; using STL_NAMESPACE::vector; @@ -221,10 +220,6 @@ void MallocExtension::Register(MallocExtension* implementation) { } } -unsigned int MallocExtension::GetBytesAllocatedOnCurrentThread() { - return tcmalloc::ThreadCache::GetBytesAllocatedOnCurrentThread(); -} - // ----------------------------------------------------------------------- // Heap sampling support // ----------------------------------------------------------------------- |