Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent message overrun in LocklessCommandFifo."

Browse Source
This commit is contained in:
Jason Sams
2010-12-05 19:54:18 -08:00
committed by Android (Google) Code Review
parent 7e06ea80f7 8ea061bcdd
commit f9adf6b74f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/rs/rsLocklessFifo.cpp
View File

@@ -166,7 +166,7 @@ bool LocklessCommandFifo::makeSpaceNonBlocking(uint32_t bytes) {
//dumpState("make space non-blocking");
if ((mPut+bytes) > mEnd) {
// Need to loop regardless of where get is.
if ((mGet > mPut) && (mBuffer+4 >= mGet)) {
if ((mGet > mPut) || (mBuffer+4 >= mGet)) {
return false;
}
@@ -189,7 +189,7 @@ void LocklessCommandFifo::makeSpace(uint32_t bytes) {
//dumpState("make space");
if ((mPut+bytes) > mEnd) {
// Need to loop regardless of where get is.
while ((mGet > mPut) && (mBuffer+4 >= mGet)) {
while ((mGet > mPut) || (mBuffer+4 >= mGet)) {
usleep(100);
}
@@ -210,4 +210,3 @@ void LocklessCommandFifo::makeSpace(uint32_t bytes) {
void LocklessCommandFifo::dumpState(const char *s) const {
LOGV("%s %p put %p, get %p, buf %p, end %p", s, this, mPut, mGet, mBuffer, mEnd);
}