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

Issue 2111933002: Android SurfaceViewRenderer: Fix deadlock (Closed)

Created:
4 years, 5 months ago by magjed_webrtc
Modified:
4 years, 5 months ago
Reviewers:
sakal
CC:
webrtc-reviews_webrtc.org, tterriberry_mozilla.com
Base URL:
https://chromium.googlesource.com/external/webrtc.git@master
Target Ref:
refs/pending/heads/master
Project:
webrtc
Visibility:
Public.

Description

Android SurfaceViewRenderer: Fix deadlock Deadlock caused by two methods grabbing two locks in the opposite order: renderFrame(): handlerLock layoutLock onMeasure(): layoutLock handlerLock This CL removs the nested locking to fix the deadlock and make it less error prone for the future. BUG=webrtc:6003 R=sakal@webrtc.org Committed: https://crrev.com/897d932e0b0b81b81393316692d8687e5975a62a Cr-Commit-Position: refs/heads/master@{#13364}

Patch Set 1 #

Total comments: 2

Patch Set 2 : Addressing samis comments #

Unified diffs Side-by-side diffs Delta from patch set Stats (+13 lines, -10 lines) Patch
M webrtc/api/java/android/org/webrtc/SurfaceViewRenderer.java View 1 3 chunks +13 lines, -10 lines 0 comments Download

Messages

Total messages: 15 (8 generated)
magjed_webrtc
Sami - Please take a look.
4 years, 5 months ago (2016-06-30 15:19:44 UTC) #3
sakal
https://codereview.webrtc.org/2111933002/diff/1/webrtc/api/java/android/org/webrtc/SurfaceViewRenderer.java File webrtc/api/java/android/org/webrtc/SurfaceViewRenderer.java (right): https://codereview.webrtc.org/2111933002/diff/1/webrtc/api/java/android/org/webrtc/SurfaceViewRenderer.java#newcode291 webrtc/api/java/android/org/webrtc/SurfaceViewRenderer.java:291: pendingFrame = frame; If renderThreadHandler is null, pendingFrame will ...
4 years, 5 months ago (2016-07-01 08:02:26 UTC) #4
magjed_webrtc
https://codereview.webrtc.org/2111933002/diff/1/webrtc/api/java/android/org/webrtc/SurfaceViewRenderer.java File webrtc/api/java/android/org/webrtc/SurfaceViewRenderer.java (right): https://codereview.webrtc.org/2111933002/diff/1/webrtc/api/java/android/org/webrtc/SurfaceViewRenderer.java#newcode291 webrtc/api/java/android/org/webrtc/SurfaceViewRenderer.java:291: pendingFrame = frame; On 2016/07/01 08:02:26, sakal wrote: > ...
4 years, 5 months ago (2016-07-01 08:53:41 UTC) #5
sakal
lgtm
4 years, 5 months ago (2016-07-01 09:08:49 UTC) #8
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/2111933002/20001
4 years, 5 months ago (2016-07-01 09:39:10 UTC) #10
commit-bot: I haz the power
Try jobs failed on following builders: android_dbg on master.tryserver.webrtc (JOB_FAILED, http://build.chromium.org/p/tryserver.webrtc/builders/android_dbg/builds/14732)
4 years, 5 months ago (2016-07-01 09:48:57 UTC) #12
magjed_webrtc
4 years, 5 months ago (2016-07-01 13:52:32 UTC) #14
Message was sent while issue was closed.
Committed patchset #2 (id:20001) manually as
897d932e0b0b81b81393316692d8687e5975a62a (presubmit successful).

Powered by Google App Engine
This is Rietveld 408576698