commit | 3547524aa0ec7952d898a28d0b6c14855b7bd2cd | [log] [tgz] |
---|---|---|
author | Evan Shrubsole <eshr@google.com> | Tue May 31 14:36:25 2022 |
committer | Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> | Tue May 31 14:36:25 2022 |
tree | 12667c7e555a995cfbbe44779b8f917ec2d26620 | |
parent | b6446243e11934b37eda84a97894ce198b0f8a3a [diff] |
[Merge M103] Reland "Fix deadlock in WebRtcMetronomeAdapter" This is a reland of commit 2f684b2dbdbc728b22eef8f4bf47479c9e1b59c5 Can reland: The build on Windows was fixed with https://webrtc-review.googlesource.com/c/src/+/262811 Original change's description: > Fix deadlock in WebRtcMetronomeAdapter > > This could occur when a listener was being removed at the same time as > OnTick was called. The problem is that OnTick first requires the > TickHandle to acquire its is_active_lock, and then the > WebRtcMetronomeAdapter would acquire its listener lock, while > RemoveListener acquires the listener lock before cancelling the > TickHandle which tries to acquire its is_active_lock. This means that > the two locks could be acquired in different orders, which led to > occasional hangs and deadlocks. > > This fix removes the requirement acquiring the listener lock when > interacting with the TickHandles, instead adding 1 TickHandle per > webrtc::Metronome::TickListener. To ensure that the TickListener::OnTick > was not invoked after it was removed a webrtc::PendingTaskSafety is used > taking advantage of the fact that the only user of webrtc::Metronome is > the webrtc::DecodeSynchronizer. The threading model or interface of > webrtc::Metronome will be clarified or reworked. > > The crash has been confirmed with a codeplay (found in the bug report). > > Bug: 1325109 > Change-Id: I15d36cde0d93bed370d0210fa4f7f8b08f5f3be0 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3649679 > Reviewed-by: Tomas Gunnarsson <tommi@chromium.org> > Commit-Queue: Evan Shrubsole <eshr@google.com> > Cr-Commit-Position: refs/heads/main@{#1004743} (cherry picked from commit ec178bb78bfcb61fbd565a2768cdc75c31513413) Bug: 1325109 Change-Id: Ia5b6f3ebad7981f853a8eac8dcf195f0ef6fc0de Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3654082 Reviewed-by: Tomas Gunnarsson <tommi@chromium.org> Commit-Queue: Evan Shrubsole <eshr@google.com> Cr-Original-Commit-Position: refs/heads/main@{#1006416} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3678447 Commit-Queue: Tomas Gunnarsson <tommi@chromium.org> Auto-Submit: Evan Shrubsole <eshr@google.com> Reviewed-by: Henrik Boström <hbos@chromium.org> Cr-Commit-Position: refs/branch-heads/5060@{#410} Cr-Branched-From: b83393d0f4038aeaf67f970a024d8101df7348d1-refs/heads/main@{#1002911}
Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.
The project's web site is https://www.chromium.org.
To check out the source code locally, don't use git clone
! Instead, follow the instructions on how to get the code.
Documentation in the source is rooted in docs/README.md.
Learn how to Get Around the Chromium Source Code Directory Structure .
For historical reasons, there are some small top level directories. Now the guidance is that new top level directories are for product (e.g. Chrome, Android WebView, Ash). Even if these products have multiple executables, the code should be in subdirectories of the product.
If you found a bug, please file it at https://crbug.com/new.