i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AdapterIO: Fix problem with RWLocker

Browse Source 
* Originally this code didn't use an AutoLocker, when I changed it
I didn't realize I created an anonymous temporary inadvertently.
* Thanks to hamishm for catching this.
This commit is contained in:
Dario Casalinuovo
2016-06-02 22:57:57 +02:00
parent 4c7eafb74b
commit be67b1022b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/media/AdapterIO.cpp
+7 -7
View File
@@ -48,7 +48,7 @@ BAdapterIO::ReadAt(off_t position, void* buffer, size_t size)
{ {
printf("read at %d %d \n", (int)position, (int)size); printf("read at %d %d \n", (int)position, (int)size);
_WaitForData(position+size); _WaitForData(position+size);
AutoReadLocker(fLock); AutoReadLocker _(fLock);
return fBuffer->ReadAt(position, buffer, size); return fBuffer->ReadAt(position, buffer, size);
} }
@@ -58,7 +58,7 @@ ssize_t
BAdapterIO::WriteAt(off_t position, const void* buffer, size_t size) BAdapterIO::WriteAt(off_t position, const void* buffer, size_t size)
{ {
_WaitForData(position+size); _WaitForData(position+size);
AutoWriteLocker(fLock); AutoWriteLocker _(fLock);
return fBuffer->WriteAt(position, buffer, size); return fBuffer->WriteAt(position, buffer, size);
} }
@@ -68,7 +68,7 @@ off_t
BAdapterIO::Seek(off_t position, uint32 seekMode) BAdapterIO::Seek(off_t position, uint32 seekMode)
{ {
_WaitForData(position); _WaitForData(position);
AutoWriteLocker(fLock); AutoWriteLocker _(fLock);
return fBuffer->Seek(position, seekMode); return fBuffer->Seek(position, seekMode);
} }
@@ -77,7 +77,7 @@ BAdapterIO::Seek(off_t position, uint32 seekMode)
off_t off_t
BAdapterIO::Position() const BAdapterIO::Position() const
{ {
AutoReadLocker(fLock); AutoReadLocker _(fLock);
return fBuffer->Position(); return fBuffer->Position();
} }
@@ -86,7 +86,7 @@ BAdapterIO::Position() const
status_t status_t
BAdapterIO::SetSize(off_t size) BAdapterIO::SetSize(off_t size)
{ {
AutoWriteLocker(fLock); AutoWriteLocker _(fLock);
return fBuffer->SetSize(size); return fBuffer->SetSize(size);
} }
@@ -95,7 +95,7 @@ BAdapterIO::SetSize(off_t size)
status_t status_t
BAdapterIO::GetSize(off_t* size) const BAdapterIO::GetSize(off_t* size) const
{ {
AutoReadLocker(fLock); AutoReadLocker _(fLock);
return fBuffer->GetSize(size); return fBuffer->GetSize(size);
} }
@@ -115,7 +115,7 @@ BAdapterIO::BuildInputAdapter()
ssize_t ssize_t
BAdapterIO::BackWrite(const void* buffer, size_t size) BAdapterIO::BackWrite(const void* buffer, size_t size)
{ {
AutoWriteLocker(fLock); AutoWriteLocker _(fLock);
off_t currentPos = Position(); off_t currentPos = Position();
off_t ret = fBuffer->WriteAt(fBackPosition, buffer, size); off_t ret = fBuffer->WriteAt(fBackPosition, buffer, size);