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

Merge "More consistently retry system calls on EINTR" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-21 09:33:30 +00:00
committed by Android (Google) Code Review
parent 398b9a8173 65fee3cfdc
commit 84d34f9ce5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -887,7 +887,7 @@ static void DetachDescriptors(JNIEnv* env,
for (int fd : fds_to_close) {
ALOGV("Switching descriptor %d to /dev/null", fd);
if (dup3(devnull_fd, fd, O_CLOEXEC) == -1) {
if (TEMP_FAILURE_RETRY(dup3(devnull_fd, fd, O_CLOEXEC)) == -1) {
fail_fn(StringPrintf("Failed dup3() on descriptor %d: %s", fd, strerror(errno)));
}
}

8
core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp
View File

@@ -426,7 +426,7 @@ jboolean com_android_internal_os_ZygoteCommandBuffer_nativeForkRepeatedly(
tmp_pid >>= 8;
}
pid_buf[4] = 0; // Process is not wrapped.
int res = write(session_socket, pid_buf, 5);
int res = TEMP_FAILURE_RETRY(write(session_socket, pid_buf, 5));
if (res != 5) {
if (res == -1) {
(first_time ? fail_fn_1 : fail_fn_n)
@@ -451,18 +451,18 @@ jboolean com_android_internal_os_ZygoteCommandBuffer_nativeForkRepeatedly(
}
// We've now seen either a disconnect or connect request.
close(session_socket);
int new_fd = accept(zygote_socket_fd, nullptr, nullptr);
int new_fd = TEMP_FAILURE_RETRY(accept(zygote_socket_fd, nullptr, nullptr));
if (new_fd == -1) {
fail_fn_z(CREATE_ERROR("Accept(%d) failed: %s", zygote_socket_fd, strerror(errno)));
}
if (new_fd != session_socket) {
// Move new_fd back to the old value, so that we don't have to change Java-level data
// structures to reflect a change. This implicitly closes the old one.
if (dup2(new_fd, session_socket) != session_socket) {
if (TEMP_FAILURE_RETRY(dup2(new_fd, session_socket)) != session_socket) {
fail_fn_z(CREATE_ERROR("Failed to move fd %d to %d: %s",
new_fd, session_socket, strerror(errno)));
}
close(new_fd);
close(new_fd); // On Linux, fd is closed even if EINTR is returned.
}
// If we ever return, we effectively reuse the old Java ZygoteConnection.
// None of its state needs to change.