Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1419488: Release IAudioSessionControl on background thread on Win7 r=jimm

Browse Source 
Releases the final reference to the IAudioSesionControl on a background thread in order to circumvent a hang at shutdown caused by stalled audio device interrupt handlers.
This commit is contained in:
David Parks 2018-05-04 15:57:26 -07:00
parent 803e173352
commit da2f987b8a
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
widget/windows/AudioSession.cpp
View File

@ -21,6 +21,7 @@
#include "nsXULAppAPI.h"
#include "mozilla/Attributes.h"
#include "mozilla/Mutex.h"
#include "mozilla/WindowsVersion.h"
#include <objbase.h>
@ -286,6 +287,26 @@ AudioSession::Start()
return NS_OK;
}
void
SpawnASCReleaseThread(RefPtr<IAudioSessionControl>&& aASC)
{
// Fake moving to the other thread by circumventing the ref count.
// (RefPtrs don't play well with C++11 lambdas and we don't want to use
// XPCOM here.)
IAudioSessionControl* rawPtr = nullptr;
aASC.forget(&rawPtr);
MOZ_ASSERT(rawPtr);
PRThread* thread =
PR_CreateThread(PR_USER_THREAD,
[](void* aRawPtr) { static_cast<IAudioSessionControl*>(aRawPtr)->Release(); },
rawPtr, PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, PR_UNJOINABLE_THREAD, 0);
if (!thread) {
// We can't make a thread so just destroy the IAudioSessionControl here.
rawPtr->Release();
}
}
void
AudioSession::StopInternal()
{
@ -296,7 +317,16 @@ AudioSession::StopInternal()
// Decrement refcount of 'this'
mAudioSessionControl->UnregisterAudioSessionNotification(this);
}
mAudioSessionControl = nullptr;
// Win7 is the only Windows version supported before Win8.
if (mAudioSessionControl && !IsWin8OrLater()) {
// bug 1419488: Avoid hanging due to Win7 race condition when destroying
// AudioSessionControl. We do that by Moving the AudioSessionControl
// to a worker thread (that we never 'join') for destruction.
SpawnASCReleaseThread(Move(mAudioSessionControl));
} else {
mAudioSessionControl = nullptr;
}
}
nsresult