Update the tcmalloc vendor branch to r144 (gperftools 2.0).

Update the tcmalloc vendor branch to r144 (gperftools 2.0).

The major reason for us to enable a fix for HEAP_PROFILE_MMAP.
Please note that this change doesn't affect Chromium builds.


BUG=114302
TEST=none

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=126715

[Dai Mikurube (NOT FULLTIME), 2012-02-02 05:57:16]

Hi Jim, Geoff,

At first, this change tries updating the vendor branch of tcmalloc.  Could you
please take a look at this?  This change doesn't affect Chromium builds.

[jar (doing other things), 2012-02-03 19:48:04]

I suspect you want to do a 3-way-merge of the branch that we're using,
before you do the update in the snapshot that doesn't impact chromium.

The current version shows the base for tcmalloc.  The diff against the
chromium branch shows the changes that we have made.  You need to use that
delta to create the Chromium update.

I'd suggest *first* doing a merge (which is painful and complex), and then
doing this snapshot to the version that you merged.

Thanks,

Jim

On Wed, Feb 1, 2012 at 9:57 PM, <dmikurube@chromium.org> wrote:

> Reviewers: jar, gpike,
>
> Message:
> Hi Jim, Geoff,
>
> At first, this change tries updating the vendor branch of tcmalloc.  Could
> you
> please take a look at this?  This change doesn't affect Chromium builds.
>
> Description:
> Update the tcmalloc vendor branch to r136 (gperftools version 1.10).
>
> The major reason for us to enable a fix for HEAP_PROFILE_MMAP.
> Please note that this change doesn't affect Chromium builds.
>
> BUG=none
> TEST=none
>
>
> Please review this at
http://codereview.chromium.**org/9316021/<http://codereview.chromium.org/9316...
>
> SVN Base:
http://git.chromium.org/git/**chromium.git@trunk<http://git.chromium.org/git/...
>
> Affected files:
>  M third_party/tcmalloc/vendor/**ChangeLog
>  M third_party/tcmalloc/vendor/**INSTALL
>  M third_party/tcmalloc/vendor/**Makefile.am
>  M third_party/tcmalloc/vendor/**Makefile.in
>  M third_party/tcmalloc/vendor/**NEWS
>  M third_party/tcmalloc/vendor/**README_windows.txt
>  M third_party/tcmalloc/vendor/**configure
>  M third_party/tcmalloc/vendor/co**nfigure.ac <http://configure.ac>
>  M third_party/tcmalloc/vendor/**doc/cpuprofile.html
>  M third_party/tcmalloc/vendor/**google-perftools.sln
>  M third_party/tcmalloc/vendor/**packages/deb/changelog
>  M third_party/tcmalloc/vendor/**packages/deb/copyright
>  M third_party/tcmalloc/vendor/**packages/rpm.sh
>  M third_party/tcmalloc/vendor/**src/base/atomicops-internals-**
> arm-generic.h
>  M third_party/tcmalloc/vendor/**src/base/atomicops-internals-**
> arm-v6plus.h
>  M third_party/tcmalloc/vendor/**src/base/basictypes.h
>  M third_party/tcmalloc/vendor/**src/base/cycleclock.h
>  M third_party/tcmalloc/vendor/**src/base/dynamic_annotations.h
>  M third_party/tcmalloc/vendor/**src/base/dynamic_annotations.c
>  M third_party/tcmalloc/vendor/**src/base/elf_mem_image.cc
>  M third_party/tcmalloc/vendor/**src/base/googleinit.h
>  M third_party/tcmalloc/vendor/**src/base/linux_syscall_**support.h
>  M third_party/tcmalloc/vendor/**src/base/logging.h
>  M third_party/tcmalloc/vendor/**src/base/spinlock_internal.cc
>  M third_party/tcmalloc/vendor/**src/base/spinlock_linux-inl.h
>  M third_party/tcmalloc/vendor/**src/base/spinlock_posix-inl.h
>  M third_party/tcmalloc/vendor/**src/base/spinlock_win32-inl.h
>  M third_party/tcmalloc/vendor/**src/base/stl_allocator.h
>  M third_party/tcmalloc/vendor/**src/base/sysinfo.cc
>  M third_party/tcmalloc/vendor/**src/central_freelist.h
>  M third_party/tcmalloc/vendor/**src/central_freelist.cc
>  M third_party/tcmalloc/vendor/**src/common.h
>  M third_party/tcmalloc/vendor/**src/common.cc
>  M third_party/tcmalloc/vendor/**src/debugallocation.cc
>  M third_party/tcmalloc/vendor/**src/google/heap-checker.h
>  M third_party/tcmalloc/vendor/**src/google/malloc_extension.h
>  M third_party/tcmalloc/vendor/**src/google/malloc_extension_c.**h
>  M third_party/tcmalloc/vendor/**src/heap-checker.cc
>  M third_party/tcmalloc/vendor/**src/heap-profile-table.h
>  M third_party/tcmalloc/vendor/**src/heap-profile-table.cc
>  M third_party/tcmalloc/vendor/**src/heap-profiler.cc
>  M third_party/tcmalloc/vendor/**src/internal_logging.h
>  M third_party/tcmalloc/vendor/**src/internal_logging.cc
>  M third_party/tcmalloc/vendor/**src/libc_override_osx.h
>  M third_party/tcmalloc/vendor/**src/malloc_extension.cc
>  M third_party/tcmalloc/vendor/**src/malloc_hook.cc
>  M third_party/tcmalloc/vendor/**src/malloc_hook_mmap_freebsd.h
>  M third_party/tcmalloc/vendor/**src/malloc_hook_mmap_linux.h
>  M third_party/tcmalloc/vendor/**src/memfs_malloc.cc
>  M third_party/tcmalloc/vendor/**src/memory_region_map.h
>  M third_party/tcmalloc/vendor/**src/memory_region_map.cc
>  M third_party/tcmalloc/vendor/**src/page_heap.h
>  M third_party/tcmalloc/vendor/**src/page_heap.cc
>  M third_party/tcmalloc/vendor/**src/page_heap_allocator.h
>  M third_party/tcmalloc/vendor/**src/pprof
>  M third_party/tcmalloc/vendor/**src/profile-handler.h
>  M third_party/tcmalloc/vendor/**src/profile-handler.cc
>  M third_party/tcmalloc/vendor/**src/profiler.cc
>  M third_party/tcmalloc/vendor/**src/span.h
>  M third_party/tcmalloc/vendor/**src/span.cc
>  M third_party/tcmalloc/vendor/**src/stack_trace_table.cc
>  M third_party/tcmalloc/vendor/**src/stacktrace.cc
>  A + third_party/tcmalloc/vendor/**src/stacktrace_arm-inl.h
>  M third_party/tcmalloc/vendor/**src/stacktrace_config.h
>  M third_party/tcmalloc/vendor/**src/stacktrace_powerpc-inl.h
>  M third_party/tcmalloc/vendor/**src/stacktrace_x86-inl.h
>  M third_party/tcmalloc/vendor/**src/static_vars.h
>  M third_party/tcmalloc/vendor/**src/static_vars.cc
>  M third_party/tcmalloc/vendor/**src/symbolize.cc
>  M third_party/tcmalloc/vendor/**src/system-alloc.cc
>  M third_party/tcmalloc/vendor/**src/tcmalloc.cc
>  M third_party/tcmalloc/vendor/**src/tests/heap-checker_**unittest.cc
>  M third_party/tcmalloc/vendor/**src/tests/profile-handler_**unittest.cc
>  M third_party/tcmalloc/vendor/**src/tests/sampler_test.cc
>  M third_party/tcmalloc/vendor/**src/tests/tcmalloc_unittest.cc
>  M third_party/tcmalloc/vendor/**src/thread_cache.h
>  M third_party/tcmalloc/vendor/**src/thread_cache.cc
>  M third_party/tcmalloc/vendor/**src/windows/config.h
>  M third_party/tcmalloc/vendor/**src/windows/ia32_opcode_map.cc
>  M third_party/tcmalloc/vendor/**src/windows/mini_disassembler.**h
>  M third_party/tcmalloc/vendor/**src/windows/mini_disassembler.**cc
>  M third_party/tcmalloc/vendor/**src/windows/mini_disassembler_**types.h
>  M third_party/tcmalloc/vendor/**src/windows/patch_functions.cc
>  M third_party/tcmalloc/vendor/**src/windows/port.h
>  M third_party/tcmalloc/vendor/**src/windows/preamble_patcher.h
>  M third_party/tcmalloc/vendor/**src/windows/preamble_patcher.**cc
>  A third_party/tcmalloc/vendor/**src/windows/preamble_patcher_**test.cc
>  M third_party/tcmalloc/vendor/**src/windows/preamble_patcher_**
> with_stub.cc
>  A third_party/tcmalloc/vendor/**src/windows/shortproc.asm
>
>
>

[jar (doing other things), 2012-02-04 03:11:54]

Hmm... I'm slightly surprised that I didn't see conflicts in/around areas that
changed (that I knew of).

Looking on my tree, most of the tcmalloc code used by us is in
third_party/tcmalloc/chromium/src

Did you merge the "right" place??  Am I confused?

Were there any conflicts in the merge that you needed to manually resolve?  If
so, please put identifying comments in there.

[Dai Mikurube (NOT FULLTIME), 2012-02-06 05:58:51]

In my understanding, tcmalloc/chromium and tcmalloc/vendor are now already based
on different versions.
* tcmalloc/chromium: based on google-perftools r111 @ crrev.com/93000
* tcmalloc/vendor: based on google-perftools r109 @ crrev.com/87286 >
crrev.com/89452

Then, we have to update the tcmalloc/chromium branch with the diff between :
- the original r109 (not available in third_party) and
- the current tcmalloc/chromium branch.

I think third_party/vendor would be updated independently.


Now, I have 5 changes to update tcmalloc, 2 for committing and 3 for working
locally.

[Committing]

*) http://codereview.chromium.org/9316021/ (This change)
It just updates the vendor tree.  As written above, I guess it would be updated
separately.

*) http://codereview.chromium.org/9311003/
Trying to update the chromium tree.  The change is actually generated by 1)
taking a diff between the original r109 (checked-out separately) and the current
tcmalloc/chromium branch, and 2) applying the diff to a clean r136 tree [*A].

[Working Locally]

*) http://codereview.chromium.org/9320005/
*) http://codereview.chromium.org/9310021/
The actual applying method to generate at [*A] above.

*) http://codereview.chromium.org/9323026/
The diff between the original r109 and the current tcmalloc/chromium branch.

[Dai Mikurube (NOT FULLTIME), 2012-02-13 10:41:56]

Updated this change to replace the vendor branch to gperftools 2.0 (r144).  It
just replaces.  No manual changes and merges.  Could you PTAL at it?

The Chromium branch is updated in the change
http://codereview.chromium.org/9311003/.

[jar (doing other things), 2012-03-14 19:38:28]

lgtm

[Dai Mikurube (NOT FULLTIME), 2012-03-14 20:10:29]

On 2012/03/14 19:38:28, jar wrote:
> lgtm

Thank you.  Committed it.