summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
Diffstat (limited to 'third_party')
-rw-r--r--third_party/tcmalloc/README50
-rw-r--r--third_party/tcmalloc/tcmalloc.gyp225
2 files changed, 115 insertions, 160 deletions
diff --git a/third_party/tcmalloc/README b/third_party/tcmalloc/README
index 7caac3c..b72502c 100644
--- a/third_party/tcmalloc/README
+++ b/third_party/tcmalloc/README
@@ -58,53 +58,3 @@ CHROME_ALLOCATOR to:
Local modifications
-------------------
jemalloc has been modified slightly to work within the Chromium build.
-
-============
-
-svn export -r 77 http://google-perftools/googlecode.com/svn/trunk vendor
-
-xcopy /E /O /Y /I vendor\src chromium\src
-
-copy config*.h \
- allocator_shim.cc \
- generic_allocators.cc \
- page_heap.* \
- port.cc \
- system-alloc.h \
- tcmalloc.cc \
- win_allocator.cc \
- tcmalloc_unittests.cc \
- unittest_utils.cc \
- heap-checker.h \
- system-alloc.h \
- chromium\src
-
-missing from our list:
- malloc_hook.cc (zero-length)
- system-alloc.cc
-
-
-
-Chromium, original
- allocator_shim.cc
- generic_allocators.cc
- tcmalloc_unittests.cc
- unittest_utils.cc
- win_allocator.cc
-
-Chromium, generated from tcmalloc
- config.h
- config_linux.h
- config_win.h
-
-tcmalloc forked:
- heap-checker.h src\google\heap-checker.h
- page_heap.cc src\page_heap.cc
- page_heap. src\page_heap.h
- port.cc src\windows\port.cc
- system-alloc.cc src\system-alloc.cc
- system-alloc.h src\system-alloc.h
- tcmalloc.cc src\tcmalloc.cc
-
-Zero-length, remove
- malloc_hook.cc
diff --git a/third_party/tcmalloc/tcmalloc.gyp b/third_party/tcmalloc/tcmalloc.gyp
index 0c3ecaf..d5ad5a3 100644
--- a/third_party/tcmalloc/tcmalloc.gyp
+++ b/third_party/tcmalloc/tcmalloc.gyp
@@ -10,7 +10,7 @@
'msvs_guid': 'C564F145-9172-42C3-BFCB-60FDEA124321',
'include_dirs': [
'.',
- 'chromium/src/base',
+ 'tcmalloc/src/base',
'tcmalloc/src',
'../..',
],
@@ -39,89 +39,89 @@
],
},
'sources': [
- 'chromium/src/config.h',
- 'chromium/src/config_linux.h',
- 'chromium/src/config_win.h',
+ 'config.h',
+ 'config_linux.h',
+ 'config_win.h',
# tcmalloc files
- 'chromium/src/base/dynamic_annotations.cc',
- 'chromium/src/base/dynamic_annotations.h',
- 'chromium/src/base/logging.cc',
- 'chromium/src/base/logging.h',
- 'chromium/src/base/low_level_alloc.cc',
- 'chromium/src/base/low_level_alloc.h',
- 'chromium/src/base/spinlock.cc',
- 'chromium/src/base/spinlock.h',
- 'chromium/src/base/sysinfo.cc',
- 'chromium/src/base/sysinfo.h',
- 'chromium/src/central_freelist.cc',
- 'chromium/src/central_freelist.h',
- 'chromium/src/common.cc',
- 'chromium/src/common.h',
- 'chromium/src/heap-profile-table.cc',
- 'chromium/src/heap-profile-table.h',
- 'chromium/src/internal_logging.cc',
- 'chromium/src/internal_logging.h',
- 'chromium/src/linked_list.h',
- 'chromium/src/malloc_hook.cc',
- 'chromium/src/malloc_hook-inl.h',
- 'chromium/src/malloc_extension.cc',
- 'chromium/src/google/malloc_extension.h',
- 'chromium/src/page_heap.cc',
- 'chromium/src/page_heap.h',
- 'chromium/src/port.h',
- 'chromium/src/sampler.cc',
- 'chromium/src/sampler.h',
- 'chromium/src/span.cc',
- 'chromium/src/span.h',
- 'chromium/src/stack_trace_table.cc',
- 'chromium/src/stack_trace_table.h',
- 'chromium/src/stacktrace.cc',
- 'chromium/src/stacktrace.h',
- 'chromium/src/static_vars.cc',
- 'chromium/src/static_vars.h',
- 'chromium/src/thread_cache.cc',
- 'chromium/src/thread_cache.h',
+ 'tcmalloc/src/base/dynamic_annotations.cc',
+ 'tcmalloc/src/base/dynamic_annotations.h',
+ 'tcmalloc/src/base/logging.cc',
+ 'tcmalloc/src/base/logging.h',
+ 'tcmalloc/src/base/low_level_alloc.cc',
+ 'tcmalloc/src/base/low_level_alloc.h',
+ 'tcmalloc/src/base/spinlock.cc',
+ 'tcmalloc/src/base/spinlock.h',
+ 'tcmalloc/src/base/sysinfo.cc',
+ 'tcmalloc/src/base/sysinfo.h',
+ 'tcmalloc/src/central_freelist.cc',
+ 'tcmalloc/src/central_freelist.h',
+ 'tcmalloc/src/common.cc',
+ 'tcmalloc/src/common.h',
+ 'tcmalloc/src/heap-profile-table.cc',
+ 'tcmalloc/src/heap-profile-table.h',
+ 'tcmalloc/src/internal_logging.cc',
+ 'tcmalloc/src/internal_logging.h',
+ 'tcmalloc/src/linked_list.h',
+ 'tcmalloc/src/malloc_hook.cc',
+ 'tcmalloc/src/malloc_hook-inl.h',
+ 'tcmalloc/src/malloc_extension.cc',
+ 'tcmalloc/src/google/malloc_extension.h',
+ 'tcmalloc/src/page_heap.cc',
+ 'tcmalloc/src/page_heap.h',
+ 'tcmalloc/src/port.h',
+ 'tcmalloc/src/sampler.cc',
+ 'tcmalloc/src/sampler.h',
+ 'tcmalloc/src/span.cc',
+ 'tcmalloc/src/span.h',
+ 'tcmalloc/src/stack_trace_table.cc',
+ 'tcmalloc/src/stack_trace_table.h',
+ 'tcmalloc/src/stacktrace.cc',
+ 'tcmalloc/src/stacktrace.h',
+ 'tcmalloc/src/static_vars.cc',
+ 'tcmalloc/src/static_vars.h',
+ 'tcmalloc/src/thread_cache.cc',
+ 'tcmalloc/src/thread_cache.h',
# non-windows
- 'chromium/src/base/linuxthreads.cc',
- 'chromium/src/base/linuxthreads.h',
- 'chromium/src/base/vdso_support.cc',
- 'chromium/src/base/vdso_support.h',
- 'chromium/src/google/tcmalloc.h',
- 'chromium/src/maybe_threads.cc',
- 'chromium/src/maybe_threads.h',
- 'chromium/src/symbolize.cc',
- 'chromium/src/symbolize.h',
- 'chromium/src/system-alloc.cc',
- 'chromium/src/system-alloc.h',
- 'chromium/src/tcmalloc.cc',
+ 'tcmalloc/src/base/linuxthreads.cc',
+ 'tcmalloc/src/base/linuxthreads.h',
+ 'tcmalloc/src/base/vdso_support.cc',
+ 'tcmalloc/src/base/vdso_support.h',
+ 'tcmalloc/src/google/tcmalloc.h',
+ 'tcmalloc/src/maybe_threads.cc',
+ 'tcmalloc/src/maybe_threads.h',
+ 'tcmalloc/src/symbolize.cc',
+ 'tcmalloc/src/symbolize.h',
+ 'tcmalloc/src/system-alloc.cc',
+ 'tcmalloc/src/system-alloc.h',
+ 'tcmalloc/src/tcmalloc.cc',
# heap-profiler/checker/cpuprofiler
- 'chromium/src/base/thread_lister.c',
- 'chromium/src/base/thread_lister.h',
- 'chromium/src/heap-checker-bcad.cc',
- 'chromium/src/heap-checker.cc',
- 'chromium/src/heap-profiler.cc',
- 'chromium/src/memory_region_map.cc',
- 'chromium/src/memory_region_map.h',
- 'chromium/src/profiledata.cc',
- 'chromium/src/profiledata.h',
- 'chromium/src/profile-handler.cc',
- 'chromium/src/profile-handler.h',
- 'chromium/src/profiler.cc',
- 'chromium/src/raw_printer.cc',
- 'chromium/src/raw_printer.h',
+ 'tcmalloc/src/base/thread_lister.c',
+ 'tcmalloc/src/base/thread_lister.h',
+ 'tcmalloc/src/heap-checker-bcad.cc',
+ 'tcmalloc/src/heap-checker.cc',
+ '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',
# tcmalloc forked files
- 'chromium/src/allocator_shim.cc',
- 'chromium/src/generic_allocators.cc',
- 'chromium/src/page_heap.cc',
- 'chromium/src/page_heap.h',
- 'chromium/src/port.cc',
- 'chromium/src/system-alloc.h',
- 'chromium/src/tcmalloc.cc',
- 'chromium/src/win_allocator.cc',
+ 'allocator_shim.cc',
+ 'generic_allocators.cc',
+ 'page_heap.cc',
+ 'page_heap.h',
+ 'port.cc',
+ 'system-alloc.h',
+ 'tcmalloc.cc',
+ 'win_allocator.cc',
# jemalloc files
'jemalloc/jemalloc.c',
@@ -132,9 +132,9 @@
],
# sources! means that these are not compiled directly.
'sources!': [
- 'chromium/src/generic_allocators.cc',
- 'chromium/src/tcmalloc.cc',
- 'chromium/src/win_allocator.cc',
+ 'generic_allocators.cc',
+ 'tcmalloc.cc',
+ 'win_allocator.cc',
],
'msvs_settings': {
# TODO(sgk): merge this with build/common.gypi settings
@@ -165,44 +165,49 @@
'libcmt',
],
'include_dirs': [
- 'chromium/src/windows',
+ 'tcmalloc/src/windows',
],
'sources!': [
- 'chromium/src/base/linuxthreads.cc',
- 'chromium/src/base/linuxthreads.h',
- 'chromium/src/base/vdso_support.cc',
- 'chromium/src/base/vdso_support.h',
- 'chromium/src/maybe_threads.cc',
- 'chromium/src/maybe_threads.h',
- 'chromium/src/symbolize.cc',
- 'chromium/src/symbolize.h',
- 'chromium/src/system-alloc.cc',
- 'chromium/src/system-alloc.h',
+ 'tcmalloc/src/base/linuxthreads.cc',
+ 'tcmalloc/src/base/linuxthreads.h',
+ 'tcmalloc/src/base/vdso_support.cc',
+ 'tcmalloc/src/base/vdso_support.h',
+ 'tcmalloc/src/maybe_threads.cc',
+ 'tcmalloc/src/maybe_threads.h',
+ 'tcmalloc/src/symbolize.cc',
+ 'tcmalloc/src/symbolize.h',
+ 'tcmalloc/src/system-alloc.cc',
+ 'tcmalloc/src/system-alloc.h',
+
+ # use forked version in windows
+ 'tcmalloc/src/tcmalloc.cc',
+ 'tcmalloc/src/page_heap.cc',
+ 'tcmalloc/src/page_heap.h',
# heap-profiler/checker/cpuprofiler
- 'chromium/src/base/thread_lister.c',
- 'chromium/src/base/thread_lister.h',
- 'chromium/src/heap-checker-bcad.cc',
- 'chromium/src/heap-checker.cc',
- 'chromium/src/heap-profiler.cc',
- 'chromium/src/memory_region_map.cc',
- 'chromium/src/memory_region_map.h',
- 'chromium/src/profiledata.cc',
- 'chromium/src/profiledata.h',
- 'chromium/src/profile-handler.cc',
- 'chromium/src/profile-handler.h',
- 'chromium/src/profiler.cc',
+ 'tcmalloc/src/base/thread_lister.c',
+ 'tcmalloc/src/base/thread_lister.h',
+ 'tcmalloc/src/heap-checker-bcad.cc',
+ 'tcmalloc/src/heap-checker.cc',
+ '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',
],
}],
['OS=="linux"', {
'sources!': [
- 'chromium/src/page_heap.cc',
- 'chromium/src/port.cc',
- 'chromium/src/system-alloc.h',
- 'chromium/src/win_allocator.cc',
+ 'page_heap.cc',
+ 'port.cc',
+ 'system-alloc.h',
+ 'win_allocator.cc',
# TODO(willchan): Support allocator shim later on.
- 'chromium/src/allocator_shim.cc',
+ 'allocator_shim.cc',
# TODO(willchan): support jemalloc on other platforms
# jemalloc files
@@ -237,14 +242,14 @@
],
'include_dirs': [
'.',
- 'chromium/src/base',
+ 'tcmalloc/src/base',
'tcmalloc/src',
'../..',
],
'msvs_guid': 'E99DA267-BE90-4F45-1294-6919DB2C9999',
'sources': [
- 'chromium/src/unittest_utils.cc',
- 'chromium/src/tcmalloc_unittests.cc',
+ 'unittest_utils.cc',
+ 'tcmalloc_unittests.cc',
],
},
],
generated by cgit v1.1 at 2025-01-22 20:58:35 +0000