Fix deadlock in webrtc_perf_tests

Fix deadlock in webrtc_perf_tests

Reenable hanging tests on Mac.

Deadlock happened because the following locks were grabbed by two threads at the end of a test:
Thread 1:
CapturedFrameForwarder::AddOrUpdateSink() locks CapturedFrameForwarder::crit_ and calls
FrameGeneratorCapturer::AddOrUpdateSink() what tries to lock FrameGeneratorCapturer::lock_.

Thread 2:
FrameGeneratorCapturer::InsertFrame() locks FrameGeneratorCapturer::lock_ and calls 
CapturedFrameForwarder::OnFrame() which tries to lock CapturedFrameForwarder::crit_.


So two threads are locking two same locks in different orders which may cause deadlock.

BUG=webrtc:7870
Review-Url: https://codereview.webrtc.org/2955083002
Cr-Commit-Position: refs/heads/master@{#18783}
Committed: https://chromium.googlesource.com/external/webrtc/+/267041c47086fc0da9ce3247a496964c924bb2d9

[ilnik, 2017-06-27 09:37:00]

Description was changed from

==========
Fix deadlock in webrtc_perf_tests

Reenable hanging tests on Mac.

BUG=webrtc:7870
==========

to

==========
Fix deadlock in webrtc_perf_tests

Reenable hanging tests on Mac.

BUG=webrtc:7870
==========

[ilnik, 2017-06-27 09:37:00]

ilnik@webrtc.org changed reviewers:
+ asapersson@webrtc.org, sprang@webrtc.org

[ilnik, 2017-06-27 13:49:16]

Description was changed from

==========
Fix deadlock in webrtc_perf_tests

Reenable hanging tests on Mac.

BUG=webrtc:7870
==========

to

==========
Fix deadlock in webrtc_perf_tests

Reenable hanging tests on Mac.

Deadlock happened because the following locks were grabbed by two threads at the
end of a test:
Thread 1:
CapturedFrameForwarder::AddOrUpdateSink() locks CapturedFrameForwarder::crit_
and calls:
FrameGeneratorCapturer::AddOrUpdateSink() what tries to lock
FrameGeneratorCapturer::lock_.

Thread 2:
FrameGeneratorCapturer::InsertFrame() locks FrameGeneratorCapturer::lock_ and
calls CapturedFrameForwarder::OnFrame()_ which tries to lock
CapturedFrameForwarder::crit_.


So two threads are locking two same locks in different orders which may cause
deadlock.

BUG=webrtc:7870
==========

[ilnik, 2017-06-27 13:50:05]

Description was changed from

==========
Fix deadlock in webrtc_perf_tests

Reenable hanging tests on Mac.

Deadlock happened because the following locks were grabbed by two threads at the
end of a test:
Thread 1:
CapturedFrameForwarder::AddOrUpdateSink() locks CapturedFrameForwarder::crit_
and calls:
FrameGeneratorCapturer::AddOrUpdateSink() what tries to lock
FrameGeneratorCapturer::lock_.

Thread 2:
FrameGeneratorCapturer::InsertFrame() locks FrameGeneratorCapturer::lock_ and
calls CapturedFrameForwarder::OnFrame()_ which tries to lock
CapturedFrameForwarder::crit_.


So two threads are locking two same locks in different orders which may cause
deadlock.

BUG=webrtc:7870
==========

to

==========
Fix deadlock in webrtc_perf_tests

Reenable hanging tests on Mac.

Deadlock happened because the following locks were grabbed by two threads at the
end of a test:
Thread 1:
CapturedFrameForwarder::AddOrUpdateSink() locks CapturedFrameForwarder::crit_
and calls
FrameGeneratorCapturer::AddOrUpdateSink() what tries to lock
FrameGeneratorCapturer::lock_.

Thread 2:
FrameGeneratorCapturer::InsertFrame() locks FrameGeneratorCapturer::lock_ and
calls 
CapturedFrameForwarder::OnFrame() which tries to lock
CapturedFrameForwarder::crit_.


So two threads are locking two same locks in different orders which may cause
deadlock.

BUG=webrtc:7870
==========

[sprang_webrtc, 2017-06-27 13:52:53]

lgtm
nice find

[ilnik, 2017-06-27 13:53:57]

The CQ bit was checked by ilnik@webrtc.org

[commit-bot: I haz the power, 2017-06-27 13:54:09]

CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2017-06-27 14:21:02]

CQ is committing da patch.

Bot data: {"patchset_id": 1, "attempt_start_ts": 1498571637533460, "parent_rev":
"4847ae6b51ea55b9db9bf16c7b97c3cb8d000f23", "commit_rev":
"267041c47086fc0da9ce3247a496964c924bb2d9"}

[commit-bot: I haz the power, 2017-06-27 14:21:17]

Description was changed from

==========
Fix deadlock in webrtc_perf_tests

Reenable hanging tests on Mac.

Deadlock happened because the following locks were grabbed by two threads at the
end of a test:
Thread 1:
CapturedFrameForwarder::AddOrUpdateSink() locks CapturedFrameForwarder::crit_
and calls
FrameGeneratorCapturer::AddOrUpdateSink() what tries to lock
FrameGeneratorCapturer::lock_.

Thread 2:
FrameGeneratorCapturer::InsertFrame() locks FrameGeneratorCapturer::lock_ and
calls 
CapturedFrameForwarder::OnFrame() which tries to lock
CapturedFrameForwarder::crit_.


So two threads are locking two same locks in different orders which may cause
deadlock.

BUG=webrtc:7870
==========

to

==========
Fix deadlock in webrtc_perf_tests

Reenable hanging tests on Mac.

Deadlock happened because the following locks were grabbed by two threads at the
end of a test:
Thread 1:
CapturedFrameForwarder::AddOrUpdateSink() locks CapturedFrameForwarder::crit_
and calls
FrameGeneratorCapturer::AddOrUpdateSink() what tries to lock
FrameGeneratorCapturer::lock_.

Thread 2:
FrameGeneratorCapturer::InsertFrame() locks FrameGeneratorCapturer::lock_ and
calls 
CapturedFrameForwarder::OnFrame() which tries to lock
CapturedFrameForwarder::crit_.


So two threads are locking two same locks in different orders which may cause
deadlock.

BUG=webrtc:7870

Review-Url: https://codereview.webrtc.org/2955083002
Cr-Commit-Position: refs/heads/master@{#18783}
Committed:
https://chromium.googlesource.com/external/webrtc/+/267041c47086fc0da9ce3247a...
==========

[commit-bot: I haz the power, 2017-06-27 14:21:18]

Committed patchset #1 (id:1) as
https://chromium.googlesource.com/external/webrtc/+/267041c47086fc0da9ce3247a...