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

Merge "Improper EINTR handling logic"

Browse Source
This commit is contained in:
Keith Mok
2021-11-18 17:11:15 +00:00
committed by Gerrit Code Review
parent f8eb7b136c 639e93ee9c
commit bd0a86f9d7
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/PrintSpooler/jni/com_android_printspooler_util_BitmapSerializeUtils.cpp
View File

@@ -30,11 +30,8 @@ static bool writeAllBytes(const int fd, void* buffer, const size_t byteCount) {
char* writeBuffer = static_cast<char*>(buffer); char* writeBuffer = static_cast<char*>(buffer);
size_t remainingBytes = byteCount; size_t remainingBytes = byteCount;
while (remainingBytes > 0) { while (remainingBytes > 0) {
ssize_t writtenByteCount = write(fd, writeBuffer, remainingBytes); ssize_t writtenByteCount = TEMP_FAILURE_RETRY(write(fd, writeBuffer, remainingBytes));
if (writtenByteCount == -1) { if (writtenByteCount == -1) {
if (errno == EINTR) {
continue;
}
__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __android_log_print(ANDROID_LOG_ERROR, LOG_TAG,
"Error writing to buffer: %d", errno); "Error writing to buffer: %d", errno);
return false; return false;
@@ -49,19 +46,17 @@ static bool readAllBytes(const int fd, void* buffer, const size_t byteCount) {
char* readBuffer = static_cast<char*>(buffer); char* readBuffer = static_cast<char*>(buffer);
size_t remainingBytes = byteCount; size_t remainingBytes = byteCount;
while (remainingBytes > 0) { while (remainingBytes > 0) {
ssize_t readByteCount = read(fd, readBuffer, remainingBytes); ssize_t readByteCount = TEMP_FAILURE_RETRY(read(fd, readBuffer, remainingBytes));
if (readByteCount == -1) {
__android_log_print(ANDROID_LOG_ERROR, LOG_TAG,
"Error reading from buffer: %d", errno);
return false;
}
remainingBytes -= readByteCount; remainingBytes -= readByteCount;
readBuffer += readByteCount; readBuffer += readByteCount;
if (readByteCount == -1) { if (readByteCount == 0 && remainingBytes > 0) {
if (errno == EINTR) {
continue;
}
__android_log_print(ANDROID_LOG_ERROR, LOG_TAG,
"Error reading from buffer: %d", errno);
return false;
} else if (readByteCount == 0 && remainingBytes > 0) {
__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __android_log_print(ANDROID_LOG_ERROR, LOG_TAG,
"File closed before all bytes were read. %zu/%zu remaining", remainingBytes, "File closed before all bytes were read. %zu/%zu remaining", remainingBytes,
byteCount); byteCount);