Commit 6dc59ac
webrtc/datachannel/multiple-connections.html is sometimes timing out after M120 upgrade
https://bugs.webkit.org/show_bug.cgi?id=267281
rdar://problem/120725671
Reviewed by Eric Carlson.
We were sometimes deadlocking when:
- main thread asks something to the webrtc stack by hopping to the signalling thread.
- signaling thread is destroying the LibWebRTCAudioModule which was calling callOnMainThreadAndWait to do its cleanup.
Instead of cleaning things in LibWebRTCAudioModule destructor synchronsouly, we are doing the clean-up asynchronously in LibWebRTCAudioModule::Terminate.
Setting m_logTimer to nullptr there is fine since m_logTimer is used in Start/Stop via callOnMainThread.
* Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCAudioModule.cpp:
(WebCore::LibWebRTCAudioModule::~LibWebRTCAudioModule):
(WebCore::LibWebRTCAudioModule::Terminate):
* Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCAudioModule.h:
Canonical link: https://commits.webkit.org/272828@main1 parent f0148ee commit 6dc59ac
2 files changed
Lines changed: 8 additions & 2 deletions
File tree
- Source/WebCore/platform/mediastream/libwebrtc
Lines changed: 7 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
50 | | - | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
51 | 56 | | |
52 | 57 | | |
| 58 | + | |
53 | 59 | | |
54 | 60 | | |
55 | 61 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
77 | 77 | | |
78 | 78 | | |
79 | 79 | | |
80 | | - | |
| 80 | + | |
81 | 81 | | |
82 | 82 | | |
83 | 83 | | |
| |||
0 commit comments