|
|
Created:
4 years, 3 months ago by perkj_webrtc Modified:
4 years, 3 months ago Reviewers:
tommi CC:
webrtc-reviews_webrtc.org, tterriberry_mozilla.com Target Ref:
refs/pending/heads/master Project:
webrtc Visibility:
Public. |
DescriptionDo not build task_queue.cc and include from webrtc_overrides in Chrome.
This is step 2 of the plan below.
The modified plan
1. First land unmodified task_queue.h into webrtc_override in Chrome
2. Modify build files in the webrtc repo to include the task_queue.h and task_queue.cc from webrtc_overrides. This will breaks webrtc Chrome FYI.
3. Combine a roll of webrtc to Chrome and a the cl in https://codereview.chromium.org/2293913003/ into one cl.
The combined cl will roll in build files from 2 and add task_queue.cc in webrtc_overrides and build task_queue_unittest.cc as part of content_unittests to test task_queue.cc in webrtc_overrides.
4... Start using task queues in webrtc........
BUG=webrtc:5687
Committed: https://crrev.com/84bd5c73da93c0ce6e7122442531ac840abe171b
Cr-Commit-Position: refs/heads/master@{#13983}
Patch Set 1 #
Total comments: 4
Patch Set 2 : Also add task_queue.cc and add base to deps. #Patch Set 3 : Revert add chrome DEPS #
Messages
Total messages: 16 (8 generated)
Description was changed from ========== Do not build task_queue.cc and include from webrtc_overrides in Chrome. This is step 2 of the plan below. The plan 1. First land unmodified task_queue.h file to Chrome 2. Modify build files in the webrtc repo to include the unmodified task_queue.h and not build task_queue.cc 3. Roll webrtc to Chrome 4. Reland https://codereview.chromium.org/2297643003/ that overrides task_queue in webrtc_overrides. 5. Modify the build files in webrtc to build webrtc_overrides/webrtc/base/task_queue.cc when build in chrome. 6. Roll again. 7. Build task_queue_unittest.cc as part of content_unittests to test task_queue.cc in webrtc_overrides. 8... Start using task queues in webrtc........ 9. Drink a beer and celebrate. BUG=webrtc:5687 ========== to ========== Do not build task_queue.cc and include from webrtc_overrides in Chrome. This is step 2 of the plan below. The plan 1. First land unmodified task_queue.h file to Chrome 2. Modify build files in the webrtc repo to include the unmodified task_queue.h and not build task_queue.cc 3. Roll webrtc to Chrome 4. Reland https://codereview.chromium.org/2297643003/ that overrides task_queue in webrtc_overrides. 5. Modify the build files in webrtc to build webrtc_overrides/webrtc/base/task_queue.cc when build in chrome. 6. Roll again. 7. Build task_queue_unittest.cc as part of content_unittests to test task_queue.cc in webrtc_overrides. 8... Start using task queues in webrtc........ 9. Drink a beer and celebrate. BUG=webrtc:5687 CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:bot1,bot2;tryserver.chromium.mac:bot3 ==========
perkj@webrtc.org changed reviewers: + tommi@webrtc.org
please?
On 2016/08/30 15:46:30, perkj_webrtc wrote: > please? Darn..... We use SequencedTaskCheckers that actually use TaskQueues. I guess I will have to land this - break chromium fyi and reland the tq implementation in chrome with the roll. if [ ! -e "./libmedia_gpu.dylib" -o ! -e "./libmedia_gpu.dylib.TOC" ] || otool -l "./libmedia_gpu.dylib" | grep -q LC_REEXPORT_DYLIB ; then TOOL_VERSION=1468932398 ../../build/toolchain/mac/linker_driver.py /b/c/cipd/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -shared -Wl,-install_name,@rpath/"libmedia_gpu.dylib" -stdlib=libc++ -arch x86_64 -isysroot /b/c/b/mac/src/build/mac_files/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk -mmacosx-version-min=10.7 -Wl,-ObjC -Wl,-rpath,@loader_path/. -Wl,-rpath,@loader_path/../../.. -o "./libmedia_gpu.dylib" -Wl,-filelist,"./libmedia_gpu.dylib.rsp" -framework CoreFoundation -framework Foundation -framework QuartzCore -framework CoreVideo ./libbase.dylib ./libgpu.dylib ./libmedia.dylib ./libgeometry.dylib ./libdisplay_types.dylib ./libgl_wrapper.dylib ./libgles2_utils.dylib ./libgfx.dylib ./libskia.dylib ./libicui18n.dylib ./libicuuc.dylib ./librange.dylib ./libplatform.dylib ./libgl_init.dylib ./libipc.dylib ./libmojo_public_system.dylib ./libui_base.dylib ./libui_data_pack.dylib ./libevents_base.dylib ./liburl.dylib ./libshared_memory_support.dylib && { otool -l "./libmedia_gpu.dylib" | grep LC_ID_DYLIB -A 5; nm -gP "./libmedia_gpu.dylib" | cut -f1-2 -d' ' | grep -v U$$; true; } > "./libmedia_gpu.dylib.TOC"; else TOOL_VERSION=1468932398 ../../build/toolchain/mac/linker_driver.py /b/c/cipd/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -shared -Wl,-install_name,@rpath/"libmedia_gpu.dylib" -stdlib=libc++ -arch x86_64 -isysroot /b/c/b/mac/src/build/mac_files/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk -mmacosx-version-min=10.7 -Wl,-ObjC -Wl,-rpath,@loader_path/. -Wl,-rpath,@loader_path/../../.. -o "./libmedia_gpu.dylib" -Wl,-filelist,"./libmedia_gpu.dylib.rsp" -framework CoreFoundation -framework Foundation -framework QuartzCore -framework CoreVideo ./libbase.dylib ./libgpu.dylib ./libmedia.dylib ./libgeometry.dylib ./libdisplay_types.dylib ./libgl_wrapper.dylib ./libgles2_utils.dylib ./libgfx.dylib ./libskia.dylib ./libicui18n.dylib ./libicuuc.dylib ./librange.dylib ./libplatform.dylib ./libgl_init.dylib ./libipc.dylib ./libmojo_public_system.dylib ./libui_base.dylib ./libui_data_pack.dylib ./libevents_base.dylib ./liburl.dylib ./libshared_memory_support.dylib && { otool -l "./libmedia_gpu.dylib" | grep LC_ID_DYLIB -A 5; nm -gP "./libmedia_gpu.dylib" | cut -f1-2 -d' ' | grep -v U$$; true; } > "./libmedia_gpu.dylib.tmp" && if ! cmp -s "./libmedia_gpu.dylib.tmp" "./libmedia_gpu.dylib.TOC"; then mv "./libmedia_gpu.dylib.tmp" "./libmedia_gpu.dylib.TOC" ; fi; fi Undefined symbols for architecture x86_64: "rtc::TaskQueue::Current()", referenced from: rtc::SequencedTaskCheckerImpl::SequencedTaskCheckerImpl() in librtc_task_queue.a(sequenced_task_checker_impl.o) rtc::SequencedTaskCheckerImpl::CalledSequentially() const in librtc_task_queue.a(sequenced_task_checker_impl.o)
Lgtm with a couple of requests https://codereview.webrtc.org/2289203002/diff/1/webrtc/base/BUILD.gn File webrtc/base/BUILD.gn (right): https://codereview.webrtc.org/2289203002/diff/1/webrtc/base/BUILD.gn#newcode207 webrtc/base/BUILD.gn:207: sources += [ "../../webrtc_overrides/webrtc/base/task_queue.h" ] I don't think we need this https://codereview.webrtc.org/2289203002/diff/1/webrtc/base/base.gyp File webrtc/base/base.gyp (right): https://codereview.webrtc.org/2289203002/diff/1/webrtc/base/base.gyp#newcode152 webrtc/base/base.gyp:152: ] Remove this section. We don't explicitly add override sources.
https://codereview.webrtc.org/2289203002/diff/1/webrtc/base/BUILD.gn File webrtc/base/BUILD.gn (right): https://codereview.webrtc.org/2289203002/diff/1/webrtc/base/BUILD.gn#newcode207 webrtc/base/BUILD.gn:207: sources += [ "../../webrtc_overrides/webrtc/base/task_queue.h" ] On 2016/08/30 16:26:04, tommi-ooo (webrtc) wrote: > I don't think we need this again- this is the same as with logging above? https://codereview.webrtc.org/2289203002/diff/1/webrtc/base/base.gyp File webrtc/base/base.gyp (right): https://codereview.webrtc.org/2289203002/diff/1/webrtc/base/base.gyp#newcode152 webrtc/base/base.gyp:152: ] On 2016/08/30 16:26:04, tommi-ooo (webrtc) wrote: > Remove this section. We don't explicitly add override sources. This is inline with how we build logging.cc and h webrtc_overrrides. Sure we dont need the header file in this cl but we need the cc file in the next. Or do I misunderstand what you mean?
Description was changed from ========== Do not build task_queue.cc and include from webrtc_overrides in Chrome. This is step 2 of the plan below. The plan 1. First land unmodified task_queue.h file to Chrome 2. Modify build files in the webrtc repo to include the unmodified task_queue.h and not build task_queue.cc 3. Roll webrtc to Chrome 4. Reland https://codereview.chromium.org/2297643003/ that overrides task_queue in webrtc_overrides. 5. Modify the build files in webrtc to build webrtc_overrides/webrtc/base/task_queue.cc when build in chrome. 6. Roll again. 7. Build task_queue_unittest.cc as part of content_unittests to test task_queue.cc in webrtc_overrides. 8... Start using task queues in webrtc........ 9. Drink a beer and celebrate. BUG=webrtc:5687 CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:bot1,bot2;tryserver.chromium.mac:bot3 ========== to ========== Do not build task_queue.cc and include from webrtc_overrides in Chrome. This is step 2 of the plan below. The plan 1. First land unmodified task_queue.h file to Chrome This is step 3 of the plan below. The modified plan 1. First land unmodified task_queue.h into webrtc_override in Chrome 2. Modify build files in the webrtc repo to include the task_queue.h and task_queue.cc from webrtc_overrides. This will breaks webrtc Chrome FYI. 3. Combine a roll of webrtc to Chrome and a the cl in https://codereview.chromium.org/2293913003/ into one cl. The combined cl will roll in build files from 2 and add task_queue.cc in webrtc_overrides and build task_queue_unittest.cc as part of content_unittests to test task_queue.cc in webrtc_overrides. 4... Start using task queues in webrtc........ BUG=webrtc:5687 ==========
Description was changed from ========== Do not build task_queue.cc and include from webrtc_overrides in Chrome. This is step 2 of the plan below. The plan 1. First land unmodified task_queue.h file to Chrome This is step 3 of the plan below. The modified plan 1. First land unmodified task_queue.h into webrtc_override in Chrome 2. Modify build files in the webrtc repo to include the task_queue.h and task_queue.cc from webrtc_overrides. This will breaks webrtc Chrome FYI. 3. Combine a roll of webrtc to Chrome and a the cl in https://codereview.chromium.org/2293913003/ into one cl. The combined cl will roll in build files from 2 and add task_queue.cc in webrtc_overrides and build task_queue_unittest.cc as part of content_unittests to test task_queue.cc in webrtc_overrides. 4... Start using task queues in webrtc........ BUG=webrtc:5687 ========== to ========== Do not build task_queue.cc and include from webrtc_overrides in Chrome. This is step 2 of the plan below. The modified plan 1. First land unmodified task_queue.h into webrtc_override in Chrome 2. Modify build files in the webrtc repo to include the task_queue.h and task_queue.cc from webrtc_overrides. This will breaks webrtc Chrome FYI. 3. Combine a roll of webrtc to Chrome and a the cl in https://codereview.chromium.org/2293913003/ into one cl. The combined cl will roll in build files from 2 and add task_queue.cc in webrtc_overrides and build task_queue_unittest.cc as part of content_unittests to test task_queue.cc in webrtc_overrides. 4... Start using task queues in webrtc........ BUG=webrtc:5687 ==========
HEj Since we already use task queue indirectly in chrome- We use SequencedTaskChecker that calls TaskQueue::Current()- I see no other option than to: 1. Land this cl that will break the chrome fyi bot. 2. Do a combined webrtc roll wth https://codereview.chromium.org/2293913003/
The CQ bit was checked by perkj@webrtc.org
The patchset sent to the CQ was uploaded after l-g-t-m from tommi@webrtc.org Link to the patchset: https://codereview.webrtc.org/2289203002/#ps40001 (title: "Revert add chrome DEPS")
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...
Message was sent while issue was closed.
Description was changed from ========== Do not build task_queue.cc and include from webrtc_overrides in Chrome. This is step 2 of the plan below. The modified plan 1. First land unmodified task_queue.h into webrtc_override in Chrome 2. Modify build files in the webrtc repo to include the task_queue.h and task_queue.cc from webrtc_overrides. This will breaks webrtc Chrome FYI. 3. Combine a roll of webrtc to Chrome and a the cl in https://codereview.chromium.org/2293913003/ into one cl. The combined cl will roll in build files from 2 and add task_queue.cc in webrtc_overrides and build task_queue_unittest.cc as part of content_unittests to test task_queue.cc in webrtc_overrides. 4... Start using task queues in webrtc........ BUG=webrtc:5687 ========== to ========== Do not build task_queue.cc and include from webrtc_overrides in Chrome. This is step 2 of the plan below. The modified plan 1. First land unmodified task_queue.h into webrtc_override in Chrome 2. Modify build files in the webrtc repo to include the task_queue.h and task_queue.cc from webrtc_overrides. This will breaks webrtc Chrome FYI. 3. Combine a roll of webrtc to Chrome and a the cl in https://codereview.chromium.org/2293913003/ into one cl. The combined cl will roll in build files from 2 and add task_queue.cc in webrtc_overrides and build task_queue_unittest.cc as part of content_unittests to test task_queue.cc in webrtc_overrides. 4... Start using task queues in webrtc........ BUG=webrtc:5687 ==========
Message was sent while issue was closed.
Committed patchset #3 (id:40001)
Message was sent while issue was closed.
Description was changed from ========== Do not build task_queue.cc and include from webrtc_overrides in Chrome. This is step 2 of the plan below. The modified plan 1. First land unmodified task_queue.h into webrtc_override in Chrome 2. Modify build files in the webrtc repo to include the task_queue.h and task_queue.cc from webrtc_overrides. This will breaks webrtc Chrome FYI. 3. Combine a roll of webrtc to Chrome and a the cl in https://codereview.chromium.org/2293913003/ into one cl. The combined cl will roll in build files from 2 and add task_queue.cc in webrtc_overrides and build task_queue_unittest.cc as part of content_unittests to test task_queue.cc in webrtc_overrides. 4... Start using task queues in webrtc........ BUG=webrtc:5687 ========== to ========== Do not build task_queue.cc and include from webrtc_overrides in Chrome. This is step 2 of the plan below. The modified plan 1. First land unmodified task_queue.h into webrtc_override in Chrome 2. Modify build files in the webrtc repo to include the task_queue.h and task_queue.cc from webrtc_overrides. This will breaks webrtc Chrome FYI. 3. Combine a roll of webrtc to Chrome and a the cl in https://codereview.chromium.org/2293913003/ into one cl. The combined cl will roll in build files from 2 and add task_queue.cc in webrtc_overrides and build task_queue_unittest.cc as part of content_unittests to test task_queue.cc in webrtc_overrides. 4... Start using task queues in webrtc........ BUG=webrtc:5687 Committed: https://crrev.com/84bd5c73da93c0ce6e7122442531ac840abe171b Cr-Commit-Position: refs/heads/master@{#13983} ==========
Message was sent while issue was closed.
Patchset 3 (id:??) landed as https://crrev.com/84bd5c73da93c0ce6e7122442531ac840abe171b Cr-Commit-Position: refs/heads/master@{#13983} |