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

Issue 1489403002: allocator cleanup: Reorganize allocator.gyp for cleanup (Closed)

Created:
5 years ago by Primiano Tucci (use gerrit)
Modified:
5 years ago
CC:
chromium-reviews, wfh+watch_chromium.org, Dai Mikurube (NOT FULLTIME), vmpstr+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

allocator cleanup: Reorganize allocator.gyp for cleanup This is the first step to move all the allocator.gyp conditionals inside allocator.gyp, rather than distributing them across all the targets. This is documented in bit.ly/allocator-cleanup under "Phase 1". This CL just moves things around as is expected to be a noop in terms of ninja files generated. The next CLs (still part oh Phase 1) will: - Remove the deprecated windows-specific tc-malloc bits and fix the situation on Mac (which mistakenly says use_allocator=tcmalloc) - Remove the conditions from the hundreds gyp targets. Rationale for the CL split: the first CLs can be landed to check for unexpected breakages without having to deal with merge conflicts on hundrends gyp files in the case of a revert. I did some manual testing, checking the effect of this CL on the ninja files produced by gyp. I used these scripts to diff the ninja: https://gist.github.com/primiano/183b31f17801f34a32e2 https://gist.github.com/primiano/fe3deb678e0a57067e7d This CL does not cause any diff in the final ninja files*, for the following configurations: OS=linux OS=linux asan=1 OS=linux component=shared_library OS=linux use_allocator=none OS=linux use_allocator=none component=shared_library OS=android OS=android component=shared_library OS=mac OS=mac component=shared_library OS=mac use_allocator=none OS=mac use_allocator=none component=shared_library OS=win OS=win component=shared_library OS=win clang=1 asan=1 OS=win GYP_MSVS_VERSION=2015 OS=win GYP_MSVS_VERSION=2015 component=shared_library *excluding the build.ninja file itself that is unstable due to crbug.com/557851. It just includes the various sub-ninja files though. BUG=564618 Committed: https://crrev.com/b0a58cabac7fe2dfe9373b113088322d9f5ce3cf Cr-Commit-Position: refs/heads/master@{#363164}

Patch Set 1 : Add comment #

Total comments: 14

Patch Set 2 : Nico review #23. Still WIP to get a zero ninja diff and make the other changes in another CL #

Patch Set 3 : zero diff attempt #

Patch Set 4 : In this CL use win and shared_library to keep a zero diff for win asan #

Patch Set 5 : one line thing #

Total comments: 2

Patch Set 6 : s/less/fewer #

Patch Set 7 : somehow lost track of dynamic_annotations along the way #

Patch Set 8 : remove obsolete comment #

Unified diffs Side-by-side diffs Delta from patch set Stats (+127 lines, -104 lines) Patch
M base/allocator/allocator.gyp View 1 2 3 4 5 6 7 4 chunks +127 lines, -104 lines 0 comments Download

Dependent Patchsets:

Messages

Total messages: 49 (31 generated)
ssid
https://codereview.chromium.org/1489403002/diff/40001/base/allocator/allocator.gyp File base/allocator/allocator.gyp (right): https://codereview.chromium.org/1489403002/diff/40001/base/allocator/allocator.gyp#newcode29 base/allocator/allocator.gyp:29: '../..', I guess this cannot work because tcmalloc will ...
5 years ago (2015-12-02 13:58:20 UTC) #2
Will Harris
https://codereview.chromium.org/1489403002/diff/40001/base/allocator/allocator.gyp File base/allocator/allocator.gyp (right): https://codereview.chromium.org/1489403002/diff/40001/base/allocator/allocator.gyp#newcode96 base/allocator/allocator.gyp:96: ['use_allocator=="tcmalloc" and os_posix==1 and OS!="mac" and OS!="ios" and OS!="android"', ...
5 years ago (2015-12-02 17:40:41 UTC) #5
Primiano Tucci (use gerrit)
> Using tcmalloc on windows is a totally unsupported configuration - the allocator > shims ...
5 years ago (2015-12-02 17:54:55 UTC) #6
Primiano Tucci (use gerrit)
Ok I think this is closer to what I want. The only thing I have ...
5 years ago (2015-12-02 21:05:10 UTC) #10
Primiano Tucci (use gerrit)
Also +thakis as a gyp-ninja and ninja-ninja
5 years ago (2015-12-02 21:10:16 UTC) #21
Mark Mentovai
Probably a bug, I don’t think we ever used tcmalloc on Mac.
5 years ago (2015-12-02 21:20:09 UTC) #22
Nico
This mostly organizes things around, right? lgtm. Maybe the rotating around could've been done in ...
5 years ago (2015-12-02 21:32:21 UTC) #23
Primiano Tucci (use gerrit)
> This mostly organizes things around, right? Right. > Maybe the rotating around could've been ...
5 years ago (2015-12-03 10:00:55 UTC) #24
Primiano Tucci (use gerrit)
Nico, I reworked this CL. AFAICT this causes pure zero-ninja-diff CL, and the next changes ...
5 years ago (2015-12-03 14:29:34 UTC) #33
Nico
lgtm! https://codereview.chromium.org/1489403002/diff/260001/base/allocator/allocator.gyp File base/allocator/allocator.gyp (right): https://codereview.chromium.org/1489403002/diff/260001/base/allocator/allocator.gyp#newcode32 base/allocator/allocator.gyp:32: # (crbug.com/564618) bring this file to a saner ...
5 years ago (2015-12-03 14:36:01 UTC) #34
Mark Mentovai
https://codereview.chromium.org/1489403002/diff/260001/base/allocator/allocator.gyp File base/allocator/allocator.gyp (right): https://codereview.chromium.org/1489403002/diff/260001/base/allocator/allocator.gyp#newcode32 base/allocator/allocator.gyp:32: # (crbug.com/564618) bring this file to a saner state ...
5 years ago (2015-12-03 14:46:49 UTC) #35
Will Harris
lgtm
5 years ago (2015-12-03 19:27:35 UTC) #37
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1489403002/320001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1489403002/320001
5 years ago (2015-12-04 00:58:26 UTC) #40
commit-bot: I haz the power
Try jobs failed on following builders: chromium_presubmit on tryserver.chromium.linux (JOB_TIMED_OUT, no build URL)
5 years ago (2015-12-04 03:11:44 UTC) #42
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1489403002/320001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1489403002/320001
5 years ago (2015-12-04 07:46:13 UTC) #44
commit-bot: I haz the power
Committed patchset #8 (id:320001)
5 years ago (2015-12-04 07:55:42 UTC) #46
commit-bot: I haz the power
Patchset 8 (id:??) landed as https://crrev.com/b0a58cabac7fe2dfe9373b113088322d9f5ce3cf Cr-Commit-Position: refs/heads/master@{#363164}
5 years ago (2015-12-04 07:56:23 UTC) #48
Primiano Tucci (use gerrit)
5 years ago (2015-12-04 09:35:36 UTC) #49
Message was sent while issue was closed.
Ssid, just realized I forgot to answer to a comment of yours:

>base/allocator/allocator.gyp:342: ['use_vtable_verify==1', {
>lines 342:353 are included without any condition. This would get added all
>targets. Is that intended?
Yes, I had a chat with the original author. That should apply to whatever
allocator we use (and is only explicitly enabled by developers, so shouldn't
have any side effects)


>base/allocator/allocator.gyp:376: 'target_name': 'libcmt',
>I think this target is not needed if win_use_allocator_shim is 0.
>Why check for shim condition above and check for shared_library condition here?
I reverted that change here to obtain a zero-diff. will re-do in the next CLs

I think all the other comments instead got addressed

Powered by Google App Engine
This is Rietveld 408576698