Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1288)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/allocator/allocator.gyp

Issue 434067: Branch the files in the shim layer that switches between the... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/allocator/README ('k') | base/allocator/allocator_shim.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/allocator/allocator.gyp
===================================================================
--- base/allocator/allocator.gyp (revision 0)
+++ base/allocator/allocator.gyp (working copy)
@@ -3,15 +3,19 @@
# found in the LICENSE file.
{
+ 'variables': {
+ 'jemalloc_dir': '../../third_party/jemalloc/chromium',
+ 'tcmalloc_dir': '../../third_party/tcmalloc/chromium',
+ },
'targets': [
{
- 'target_name': 'tcmalloc',
+ 'target_name': 'allocator',
'type': '<(library)',
'msvs_guid': 'C564F145-9172-42C3-BFCB-60FDEA124321',
'include_dirs': [
'.',
- 'tcmalloc/src/base',
- 'tcmalloc/src',
+ '<(tcmalloc_dir)/src/base',
+ '<(tcmalloc_dir)/src',
'../..',
],
'defines': [
@@ -24,7 +28,7 @@
'VCLinkerTool': {
'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'],
'AdditionalDependencies': [
- '<(SHARED_INTERMEDIATE_DIR)/tcmalloc/libcmt.lib'
+ '<(SHARED_INTERMEDIATE_DIR)/allocator/libcmt.lib'
],
},
},
@@ -39,102 +43,100 @@
],
},
'sources': [
- 'config.h',
- 'config_linux.h',
- 'config_win.h',
+ # Generated for our configuration from tcmalloc's build
+ # and checked in.
+ '<(tcmalloc_dir)/src/config.h',
+ '<(tcmalloc_dir)/src/config_linux.h',
+ '<(tcmalloc_dir)/src/config_win.h',
# tcmalloc files
- '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',
+ '<(tcmalloc_dir)/src/base/dynamic_annotations.cc',
+ '<(tcmalloc_dir)/src/base/dynamic_annotations.h',
+ '<(tcmalloc_dir)/src/base/logging.cc',
+ '<(tcmalloc_dir)/src/base/logging.h',
+ '<(tcmalloc_dir)/src/base/low_level_alloc.cc',
+ '<(tcmalloc_dir)/src/base/low_level_alloc.h',
+ '<(tcmalloc_dir)/src/base/spinlock.cc',
+ '<(tcmalloc_dir)/src/base/spinlock.h',
+ '<(tcmalloc_dir)/src/base/sysinfo.cc',
+ '<(tcmalloc_dir)/src/base/sysinfo.h',
+ '<(tcmalloc_dir)/src/central_freelist.cc',
+ '<(tcmalloc_dir)/src/central_freelist.h',
+ '<(tcmalloc_dir)/src/common.cc',
+ '<(tcmalloc_dir)/src/common.h',
+ '<(tcmalloc_dir)/src/heap-profile-table.cc',
+ '<(tcmalloc_dir)/src/heap-profile-table.h',
+ '<(tcmalloc_dir)/src/internal_logging.cc',
+ '<(tcmalloc_dir)/src/internal_logging.h',
+ '<(tcmalloc_dir)/src/linked_list.h',
+ '<(tcmalloc_dir)/src/malloc_hook.cc',
+ '<(tcmalloc_dir)/src/malloc_hook-inl.h',
+ '<(tcmalloc_dir)/src/malloc_extension.cc',
+ '<(tcmalloc_dir)/src/google/malloc_extension.h',
+ '<(tcmalloc_dir)/src/page_heap.cc',
+ '<(tcmalloc_dir)/src/page_heap.h',
+ '<(tcmalloc_dir)/src/sampler.cc',
+ '<(tcmalloc_dir)/src/sampler.h',
+ '<(tcmalloc_dir)/src/span.cc',
+ '<(tcmalloc_dir)/src/span.h',
+ '<(tcmalloc_dir)/src/stack_trace_table.cc',
+ '<(tcmalloc_dir)/src/stack_trace_table.h',
+ '<(tcmalloc_dir)/src/stacktrace.cc',
+ '<(tcmalloc_dir)/src/stacktrace.h',
+ '<(tcmalloc_dir)/src/static_vars.cc',
+ '<(tcmalloc_dir)/src/static_vars.h',
+ '<(tcmalloc_dir)/src/thread_cache.cc',
+ '<(tcmalloc_dir)/src/thread_cache.h',
+ '<(tcmalloc_dir)/src/windows/port.cc',
+ '<(tcmalloc_dir)/src/windows/port.h',
# non-windows
- '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',
+ '<(tcmalloc_dir)/src/base/linuxthreads.cc',
+ '<(tcmalloc_dir)/src/base/linuxthreads.h',
+ '<(tcmalloc_dir)/src/base/vdso_support.cc',
+ '<(tcmalloc_dir)/src/base/vdso_support.h',
+ '<(tcmalloc_dir)/src/google/tcmalloc.h',
+ '<(tcmalloc_dir)/src/maybe_threads.cc',
+ '<(tcmalloc_dir)/src/maybe_threads.h',
+ '<(tcmalloc_dir)/src/symbolize.cc',
+ '<(tcmalloc_dir)/src/symbolize.h',
+ '<(tcmalloc_dir)/src/system-alloc.cc',
+ '<(tcmalloc_dir)/src/system-alloc.h',
+ '<(tcmalloc_dir)/src/tcmalloc.cc',
# heap-profiler/checker/cpuprofiler
- '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_dir)/src/base/thread_lister.c',
+ '<(tcmalloc_dir)/src/base/thread_lister.h',
+ '<(tcmalloc_dir)/src/heap-checker-bcad.cc',
+ '<(tcmalloc_dir)/src/heap-checker.cc',
+ '<(tcmalloc_dir)/src/heap-profiler.cc',
+ '<(tcmalloc_dir)/src/memory_region_map.cc',
+ '<(tcmalloc_dir)/src/memory_region_map.h',
+ '<(tcmalloc_dir)/src/profiledata.cc',
+ '<(tcmalloc_dir)/src/profiledata.h',
+ '<(tcmalloc_dir)/src/profile-handler.cc',
+ '<(tcmalloc_dir)/src/profile-handler.h',
+ '<(tcmalloc_dir)/src/profiler.cc',
+ '<(tcmalloc_dir)/src/raw_printer.cc',
+ '<(tcmalloc_dir)/src/raw_printer.h',
- # tcmalloc forked files
+ # jemalloc files
+ '<(jemalloc_dir)/jemalloc.c',
+ '<(jemalloc_dir)/jemalloc.h',
+ '<(jemalloc_dir)/ql.h',
+ '<(jemalloc_dir)/qr.h',
+ '<(jemalloc_dir)/rb.h',
+
'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',
- 'jemalloc/jemalloc.h',
- 'jemalloc/ql.h',
- 'jemalloc/qr.h',
- 'jemalloc/rb.h',
],
# sources! means that these are not compiled directly.
'sources!': [
'generic_allocators.cc',
- 'tcmalloc.cc',
'win_allocator.cc',
+
+ '<(tcmalloc_dir)/src/tcmalloc.cc',
],
'msvs_settings': {
# TODO(sgk): merge this with build/common.gypi settings
@@ -165,57 +167,52 @@
'libcmt',
],
'include_dirs': [
- 'tcmalloc/src/windows',
+ '<(tcmalloc_dir)/src/windows',
],
'sources!': [
- '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',
+ '<(tcmalloc_dir)/src/base/linuxthreads.cc',
+ '<(tcmalloc_dir)/src/base/linuxthreads.h',
+ '<(tcmalloc_dir)/src/base/vdso_support.cc',
+ '<(tcmalloc_dir)/src/base/vdso_support.h',
+ '<(tcmalloc_dir)/src/maybe_threads.cc',
+ '<(tcmalloc_dir)/src/maybe_threads.h',
+ '<(tcmalloc_dir)/src/symbolize.cc',
+ '<(tcmalloc_dir)/src/symbolize.h',
+ '<(tcmalloc_dir)/src/system-alloc.cc',
+ '<(tcmalloc_dir)/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
- '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_dir)/src/base/thread_lister.c',
+ '<(tcmalloc_dir)/src/base/thread_lister.h',
+ '<(tcmalloc_dir)/src/heap-checker-bcad.cc',
+ '<(tcmalloc_dir)/src/heap-checker.cc',
+ '<(tcmalloc_dir)/src/heap-profiler.cc',
+ '<(tcmalloc_dir)/src/memory_region_map.cc',
+ '<(tcmalloc_dir)/src/memory_region_map.h',
+ '<(tcmalloc_dir)/src/profiledata.cc',
+ '<(tcmalloc_dir)/src/profiledata.h',
+ '<(tcmalloc_dir)/src/profile-handler.cc',
+ '<(tcmalloc_dir)/src/profile-handler.h',
+ '<(tcmalloc_dir)/src/profiler.cc',
],
}],
['OS=="linux"', {
'sources!': [
- 'page_heap.cc',
- 'port.cc',
- 'system-alloc.h',
- 'win_allocator.cc',
+ '<(tcmalloc_dir)/src/page_heap.cc',
+ '<(tcmalloc_dir)/src/system-alloc.h',
+ '<(tcmalloc_dir)/src/windows/port.cc',
+ '<(tcmalloc_dir)/src/windows/port.h',
# TODO(willchan): Support allocator shim later on.
'allocator_shim.cc',
# TODO(willchan): support jemalloc on other platforms
# jemalloc files
- 'jemalloc/jemalloc.c',
- 'jemalloc/jemalloc.h',
- 'jemalloc/ql.h',
- 'jemalloc/qr.h',
- 'jemalloc/rb.h',
+ '<(jemalloc_dir)/jemalloc.c',
+ '<(jemalloc_dir)/jemalloc.h',
+ '<(jemalloc_dir)/ql.h',
+ '<(jemalloc_dir)/qr.h',
+ '<(jemalloc_dir)/rb.h',
],
'cflags!': [
'-fvisibility=hidden',
@@ -234,22 +231,22 @@
],
},
{
- 'target_name': 'tcmalloc_unittests',
+ 'target_name': 'allocator_unittests',
'type': 'executable',
'dependencies': [
- 'tcmalloc',
+ 'allocator',
'../../testing/gtest.gyp:gtest',
],
'include_dirs': [
'.',
- 'tcmalloc/src/base',
- 'tcmalloc/src',
+ '<(tcmalloc_dir)/src/base',
+ '<(tcmalloc_dir)/src',
'../..',
],
'msvs_guid': 'E99DA267-BE90-4F45-1294-6919DB2C9999',
'sources': [
'unittest_utils.cc',
- 'tcmalloc_unittests.cc',
+ 'allocator_unittests.cc',
],
},
],
@@ -266,12 +263,12 @@
'prep_libc.sh',
],
'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/tcmalloc/libcmt.lib',
+ '<(SHARED_INTERMEDIATE_DIR)/allocator/libcmt.lib',
],
'action': [
'./prep_libc.sh',
'$(VCInstallDir)lib',
- '<(SHARED_INTERMEDIATE_DIR)/tcmalloc',
+ '<(SHARED_INTERMEDIATE_DIR)/allocator',
],
},
],
« no previous file with comments | « base/allocator/README ('k') | base/allocator/allocator_shim.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698