diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-20 16:33:58 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-20 16:33:58 +0000 |
| commit | 821b55cc3ee643d81d05d0d2bc54c0f6c094c16b (patch) | |
| tree | 17c15abdc41a46dc6057033d5e954d096533e0f4 /third_party/tcmalloc | |
| parent | dbb92e0d55eede17bf2ada8370650d39834e6060 (diff) | |
| download | chromium_src-821b55cc3ee643d81d05d0d2bc54c0f6c094c16b.zip chromium_src-821b55cc3ee643d81d05d0d2bc54c0f6c094c16b.tar.gz chromium_src-821b55cc3ee643d81d05d0d2bc54c0f6c094c16b.tar.bz2 | |
Linux: make cpu profiler buildable with tcmalloc (does not enable tcmalloc).
I forgot to add the cpu profiler files last time and got surprised when CPUPROFILE didn't do anything. I've added the files in now.
I also made the libcmt dependency specific to windows, since the make build doesn't like it.
Review URL: http://codereview.chromium.org/173110
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23823 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/tcmalloc')
| -rw-r--r-- | third_party/tcmalloc/tcmalloc.gyp | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/third_party/tcmalloc/tcmalloc.gyp b/third_party/tcmalloc/tcmalloc.gyp index 32b6555..b6d07f3 100644 --- a/third_party/tcmalloc/tcmalloc.gyp +++ b/third_party/tcmalloc/tcmalloc.gyp @@ -11,9 +11,6 @@ 'target_name': 'tcmalloc', 'type': '<(library)', 'msvs_guid': 'C564F145-9172-42C3-BFCB-60FDEA124321', - 'dependencies': [ - 'libcmt', - ], 'include_dirs': [ '.', 'tcmalloc/src/base', @@ -104,7 +101,7 @@ 'tcmalloc/src/system-alloc.h', 'tcmalloc/src/tcmalloc.cc', - # heap-profiler/checker + # heap-profiler/checker/cpuprofiler 'tcmalloc/src/base/thread_lister.c', 'tcmalloc/src/base/thread_lister.h', 'tcmalloc/src/heap-checker-bcad.cc', @@ -112,6 +109,11 @@ 'tcmalloc/src/heap-profiler.cc', 'tcmalloc/src/memory_region_map.cc', 'tcmalloc/src/memory_region_map.h', + 'tcmalloc/src/profiledata.cc', + 'tcmalloc/src/profiledata.h', + 'tcmalloc/src/profile-handler.cc', + 'tcmalloc/src/profile-handler.h', + 'tcmalloc/src/profiler.cc', 'tcmalloc/src/raw_printer.cc', 'tcmalloc/src/raw_printer.h', @@ -161,6 +163,9 @@ }, 'conditions': [ ['OS=="win"', { + 'dependencies': [ + 'libcmt', + ], 'include_dirs': [ 'tcmalloc/src/windows', ], @@ -179,7 +184,7 @@ 'tcmalloc/src/page_heap.cc', 'tcmalloc/src/page_heap.h', - # heap-profiler/checker + # heap-profiler/checker/cpuprofiler 'tcmalloc/src/base/thread_lister.c', 'tcmalloc/src/base/thread_lister.h', 'tcmalloc/src/heap-checker-bcad.cc', @@ -187,6 +192,11 @@ 'tcmalloc/src/heap-profiler.cc', 'tcmalloc/src/memory_region_map.cc', 'tcmalloc/src/memory_region_map.h', + 'tcmalloc/src/profiledata.cc', + 'tcmalloc/src/profiledata.h', + 'tcmalloc/src/profile-handler.cc', + 'tcmalloc/src/profile-handler.h', + 'tcmalloc/src/profiler.cc', 'tcmalloc/src/raw_printer.cc', 'tcmalloc/src/raw_printer.h', @@ -217,9 +227,9 @@ ], 'link_settings': { 'ldflags': [ - # Don't let linker rip this symbol out, otherwise the heap - # profiler will not initialize properly on startup. - '-Wl,-uIsHeapProfilerRunning', + # Don't let linker rip this symbol out, otherwise the heap&cpu + # profilers will not initialize properly on startup. + '-Wl,-uIsHeapProfilerRunning,-uProfilerStart', ], }, }], |