|
|
Created:
5 years, 5 months ago by brettw Modified:
5 years, 4 months ago CC:
chromium-reviews, wfh+watch_chromium.org, erikwright+watch_chromium.org, Dai Mikurube (NOT FULLTIME), feature-media-reviews_chromium.org Base URL:
https://chromium.googlesource.com/chromium/src.git@master Target Ref:
refs/pending/heads/master Project:
chromium Visibility:
Public. |
DescriptionWork on Windows GN allocator.
Hooks up the allocator shim on Windows. The GN build uses the Windows heap like GYP does.
This makes tcmalloc actually compile on Windows if you manually request it, although it doesn't actually seem to work correctly. I added an assert noting this if you try to set the flag on Windows. Note that this is never run by default on GYP and we may never want it.
This sets the ALLOCATOR_SHIM for the one media file that uses it.
Committed: https://crrev.com/5444db5ddf7eb68a5241e84f8f179c6d2739aaa5
Cr-Commit-Position: refs/heads/master@{#339798}
Patch Set 1 #Patch Set 2 : #
Messages
Total messages: 21 (5 generated)
brettw@chromium.org changed reviewers: + dpranke@chromium.org
The CQ bit was checked by brettw@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1246083005/1
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: This issue passed the CQ dry run.
lgtm
we don't use tcmalloc on Windows at all, I'm not sure why we would be compiling it?
On 2015/07/21 23:29:13, Will Harris wrote: > we don't use tcmalloc on Windows at all, I'm not sure why we would be compiling > it? Yes, I requested it manually for testing. I clarified this situation= in the CL description and code.
On 2015/07/21 23:55:38, brettw wrote: > On 2015/07/21 23:29:13, Will Harris wrote: > > we don't use tcmalloc on Windows at all, I'm not sure why we would be > compiling > > it? > > Yes, I requested it manually for testing. I clarified this situation= in the CL > description and code. okay I wasn't sure what the exact bug was you were trying to fix - is it that the alloactor shim is not enabled on GN builds, or that you want to be able to compile tcmalloc on windows? Is there a BUG= link that expresses this?
The CQ bit was checked by brettw@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1246083005/20001
i'd really like to see a BUG= link here to know what this the aim of this CL is...
Message was sent while issue was closed.
Committed patchset #2 (id:20001)
Message was sent while issue was closed.
Patchset 2 (id:??) landed as https://crrev.com/5444db5ddf7eb68a5241e84f8f179c6d2739aaa5 Cr-Commit-Position: refs/heads/master@{#339798}
Message was sent while issue was closed.
For the record, Will and I chatted off line. This is just bringing the GN build a bit closer to GYP.
Message was sent while issue was closed.
thakis@chromium.org changed reviewers: + thakis@chromium.org
Message was sent while issue was closed.
This breaks building with clang on Windows with gn: http://build.chromium.org/p/chromium.fyi/builders/CrWinClang64%28dbg%29/build... FAILED: ninja -t msvc -e environment.x64 -- ../../third_party/llvm-build/Release+Asserts/bin/clang-cl.exe /nologo /showIncludes /FC @obj/base/allocator/allocator_shim/allocator_shim_win.obj.rsp /c ../../base/allocator/allocator_shim_win.cc /Foobj/base/allocator/allocator_shim/allocator_shim_win.obj /Fdobj/base/allocator/allocator_shim_cc.pdb ../../base/allocator/allocator_shim_win.cc(149,5) : error: '_set_new_mode' redeclared without 'dllimport' attribute: previous 'dllimport' ignored [-Werror,-Winconsistent-dllimport] int _set_new_mode(int flag) throw() { ^ C:\b\depot_tools\win_toolchain\vs2013_files\win8sdk\bin\..\..\VC\include\new.h(114,21) : note: previous declaration is here _CRTIMP int __cdecl _set_new_mode( _In_ int _NewMode); ^ C:\b\depot_tools\win_toolchain\vs2013_files\win8sdk\bin\..\..\VC\include\new.h(114,1) : note: previous attribute is here _CRTIMP int __cdecl _set_new_mode( _In_ int _NewMode); ^ C:\b\depot_tools\win_toolchain\vs2013_files\win8sdk\bin\..\..\VC\include\crtdefs.h(21,28) : note: expanded from macro '_CRTIMP' #define _CRTIMP __declspec(dllimport) ^ etc. Can you take a look?
Message was sent while issue was closed.
On 2015/07/22 17:23:09, Nico (hiding) wrote: > This breaks building with clang on Windows with gn: > > http://build.chromium.org/p/chromium.fyi/builders/CrWinClang64%28dbg%29/build... > > FAILED: ninja -t msvc -e environment.x64 -- > ../../third_party/llvm-build/Release+Asserts/bin/clang-cl.exe /nologo > /showIncludes /FC @obj/base/allocator/allocator_shim/allocator_shim_win.obj.rsp > /c ../../base/allocator/allocator_shim_win.cc > /Foobj/base/allocator/allocator_shim/allocator_shim_win.obj > /Fdobj/base/allocator/allocator_shim_cc.pdb > ../../base/allocator/allocator_shim_win.cc(149,5) : error: '_set_new_mode' > redeclared without 'dllimport' attribute: previous 'dllimport' ignored > [-Werror,-Winconsistent-dllimport] > int _set_new_mode(int flag) throw() { > ^ > C:\b\depot_tools\win_toolchain\vs2013_files\win8sdk\bin\..\..\VC\include\new.h(114,21) > : note: previous declaration is here > _CRTIMP int __cdecl _set_new_mode( _In_ int _NewMode); > ^ > C:\b\depot_tools\win_toolchain\vs2013_files\win8sdk\bin\..\..\VC\include\new.h(114,1) > : note: previous attribute is here > _CRTIMP int __cdecl _set_new_mode( _In_ int _NewMode); > ^ > C:\b\depot_tools\win_toolchain\vs2013_files\win8sdk\bin\..\..\VC\include\crtdefs.h(21,28) > : note: expanded from macro '_CRTIMP' > #define _CRTIMP __declspec(dllimport) > ^ > > etc. Can you take a look? Ping.
Message was sent while issue was closed.
On 2015/07/22 20:09:45, Nico (hiding) wrote: > On 2015/07/22 17:23:09, Nico (hiding) wrote: > > This breaks building with clang on Windows with gn: > > > > > http://build.chromium.org/p/chromium.fyi/builders/CrWinClang64%28dbg%29/build... > > > > FAILED: ninja -t msvc -e environment.x64 -- > > ../../third_party/llvm-build/Release+Asserts/bin/clang-cl.exe /nologo > > /showIncludes /FC > @obj/base/allocator/allocator_shim/allocator_shim_win.obj.rsp > > /c ../../base/allocator/allocator_shim_win.cc > > /Foobj/base/allocator/allocator_shim/allocator_shim_win.obj > > /Fdobj/base/allocator/allocator_shim_cc.pdb > > ../../base/allocator/allocator_shim_win.cc(149,5) : error: '_set_new_mode' > > redeclared without 'dllimport' attribute: previous 'dllimport' ignored > > [-Werror,-Winconsistent-dllimport] > > int _set_new_mode(int flag) throw() { > > ^ > > > C:\b\depot_tools\win_toolchain\vs2013_files\win8sdk\bin\..\..\VC\include\new.h(114,21) > > : note: previous declaration is here > > _CRTIMP int __cdecl _set_new_mode( _In_ int _NewMode); > > ^ > > > C:\b\depot_tools\win_toolchain\vs2013_files\win8sdk\bin\..\..\VC\include\new.h(114,1) > > : note: previous attribute is here > > _CRTIMP int __cdecl _set_new_mode( _In_ int _NewMode); > > ^ > > > C:\b\depot_tools\win_toolchain\vs2013_files\win8sdk\bin\..\..\VC\include\crtdefs.h(21,28) > > : note: expanded from macro '_CRTIMP' > > #define _CRTIMP __declspec(dllimport) > > ^ > > > > etc. Can you take a look? > > Ping. Will look shortly.
Message was sent while issue was closed.
On 2015/07/22 20:28:35, brettw wrote: > On 2015/07/22 20:09:45, Nico (hiding) wrote: > > On 2015/07/22 17:23:09, Nico (hiding) wrote: > > > This breaks building with clang on Windows with gn: > > > > > > > > > http://build.chromium.org/p/chromium.fyi/builders/CrWinClang64%28dbg%29/build... > > > > > > FAILED: ninja -t msvc -e environment.x64 -- > > > ../../third_party/llvm-build/Release+Asserts/bin/clang-cl.exe /nologo > > > /showIncludes /FC > > @obj/base/allocator/allocator_shim/allocator_shim_win.obj.rsp > > > /c ../../base/allocator/allocator_shim_win.cc > > > /Foobj/base/allocator/allocator_shim/allocator_shim_win.obj > > > /Fdobj/base/allocator/allocator_shim_cc.pdb > > > ../../base/allocator/allocator_shim_win.cc(149,5) : error: '_set_new_mode' > > > redeclared without 'dllimport' attribute: previous 'dllimport' ignored > > > [-Werror,-Winconsistent-dllimport] > > > int _set_new_mode(int flag) throw() { > > > ^ > > > > > > C:\b\depot_tools\win_toolchain\vs2013_files\win8sdk\bin\..\..\VC\include\new.h(114,21) > > > : note: previous declaration is here > > > _CRTIMP int __cdecl _set_new_mode( _In_ int _NewMode); > > > ^ > > > > > > C:\b\depot_tools\win_toolchain\vs2013_files\win8sdk\bin\..\..\VC\include\new.h(114,1) > > > : note: previous attribute is here > > > _CRTIMP int __cdecl _set_new_mode( _In_ int _NewMode); > > > ^ > > > > > > C:\b\depot_tools\win_toolchain\vs2013_files\win8sdk\bin\..\..\VC\include\crtdefs.h(21,28) > > > : note: expanded from macro '_CRTIMP' > > > #define _CRTIMP __declspec(dllimport) > > > ^ > > > > > > etc. Can you take a look? > > > > Ping. > > Will look shortly. (I might've figured this out: https://code.google.com/p/chromium/issues/detail?id=521788#c6) |