Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-21 06:01:13 +02:00
Code Issues Releases Wiki Activity

Stricter memory ordering in RingBuffer

Browse Source
This commit is contained in:
Paul Licameli
2018-06-21 13:40:01 -04:00
parent bd7e6f7279
commit fcdfd68d73
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/RingBuffer.cpp
View File

@@ -54,9 +54,8 @@ size_t RingBuffer::Free( size_t start, size_t end )
//
// For the writer only:
// Only writer writes the end, so it can read it again relaxed
// And it reads the start written by reader, but reader sends no other
// information needing to synchronize with the start, so relaxed memory order
// is good there too
// And it reads the start written by reader, with acquire order,
// so that any reading done in Get() happens-before any reuse of the space.
//
size_t RingBuffer::AvailForPut()
@@ -72,7 +71,7 @@ size_t RingBuffer::AvailForPut()
size_t RingBuffer::Put(samplePtr buffer, sampleFormat format,
size_t samplesToCopy)
{
auto start = mStart.load( std::memory_order_relaxed );
auto start = mStart.load( std::memory_order_acquire );
auto end = mEnd.load( std::memory_order_relaxed );
samplesToCopy = std::min( samplesToCopy, Free( start, end ) );
auto src = buffer;
@@ -167,7 +166,7 @@ size_t RingBuffer::Get(samplePtr buffer, sampleFormat format,
}
// Communicate to writer that we have consumed some data, and that's all
mStart.store( start, std::memory_order_relaxed );
mStart.store( start, std::memory_order_release );
return copied;
}