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

Merge "Retry on signal." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-29 02:19:55 +00:00
committed by Android (Google) Code Review
parent 80a8cf86c0 d5477e6688
commit 5fcb94848d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/jni/com_android_server_pm_PackageManagerShellCommandDataLoader.cpp
View File

@@ -133,8 +133,12 @@ static bool sendRequest(int fd, RequestType requestType, FileIdx fileIdx = -1,
static int waitForDataOrSignal(int fd, int event_fd) { static int waitForDataOrSignal(int fd, int event_fd) {
struct pollfd pfds[2] = {{fd, POLLIN, 0}, {event_fd, POLLIN, 0}}; struct pollfd pfds[2] = {{fd, POLLIN, 0}, {event_fd, POLLIN, 0}};
// Wait indefinitely until either data is ready or stop signal is received // Wait until either data is ready or stop signal is received
int res = poll(pfds, 2, PollTimeoutMs); int res = poll(pfds, 2, PollTimeoutMs);
if (res == -1 && errno == EINTR) {
// Treat it the same as timeout and allow the caller to retry.
return 0;
}
if (res <= 0) { if (res <= 0) {
return res; return res;
} }