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

Bug 1207753 - webaudio thread-safety annotations r=padenot

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D130588
This commit is contained in:
Randell Jesup 2022-03-22 14:07:34 +00:00
parent f5062f8f3b
commit 6ba2bca6f4
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dom/media/webaudio/ScriptProcessorNode.cpp
View File

@ -31,7 +31,8 @@ class SharedBuffers final {
public:
explicit OutputQueue(const char* aName) : mMutex(aName) {}
size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const {
size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const
REQUIRES(mMutex) {
mMutex.AssertCurrentThreadOwns();
size_t amount = 0;
@ -42,16 +43,18 @@ class SharedBuffers final {
return amount;
}
Mutex& Lock() const { return const_cast<OutputQueue*>(this)->mMutex; }
Mutex& Lock() const RETURN_CAPABILITY(mMutex) {
return const_cast<OutputQueue*>(this)->mMutex;
}
size_t ReadyToConsume() const {
size_t ReadyToConsume() const REQUIRES(mMutex) {
// Accessed on both main thread and media graph thread.
mMutex.AssertCurrentThreadOwns();
return mBufferList.size();
}
// Produce one buffer
AudioChunk& Produce() {
AudioChunk& Produce() REQUIRES(mMutex) {
mMutex.AssertCurrentThreadOwns();
MOZ_ASSERT(NS_IsMainThread());
mBufferList.push_back(AudioChunk());
@ -59,7 +62,7 @@ class SharedBuffers final {
}
// Consumes one buffer.
AudioChunk Consume() {
AudioChunk Consume() REQUIRES(mMutex) {
mMutex.AssertCurrentThreadOwns();
MOZ_ASSERT(!NS_IsMainThread());
MOZ_ASSERT(ReadyToConsume() > 0);
@ -69,7 +72,7 @@ class SharedBuffers final {
}
// Empties the buffer queue.
void Clear() {
void Clear() REQUIRES(mMutex) {
mMutex.AssertCurrentThreadOwns();
mBufferList.clear();
}

4
dom/media/webaudio/blink/HRTFDatabaseLoader.h
View File

@ -143,8 +143,8 @@ class HRTFDatabaseLoader {
nsAutoRef<HRTFDatabase> m_hrtfDatabase;
// Holding a m_threadLock is required when accessing m_databaseLoaderThread.
mozilla::Mutex m_threadLock MOZ_UNANNOTATED;
PRThread* m_databaseLoaderThread;
mozilla::Mutex m_threadLock;
PRThread* m_databaseLoaderThread GUARDED_BY(m_threadLock);
float m_databaseSampleRate;
mozilla::Atomic<bool> m_databaseLoaded;