ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 50ad67e4: Merge "Add better timeout mechanism for running commands."

Browse Source 
* commit '50ad67e4ce6b07b5f5f4649ace81ed9a8b2c2eac':
  Add better timeout mechanism for running commands.
This commit is contained in:
Christopher Ferris 2015-02-04 02:08:44 +00:00 committed by Android Git Automerger
commit 16c62c468a
1 changed files with 70 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
cmds/dumpstate/utils.c
View File

@ -301,6 +301,50 @@ static int64_t nanotime() {
return (int64_t)ts.tv_sec * NANOS_PER_SEC + ts.tv_nsec; return (int64_t)ts.tv_sec * NANOS_PER_SEC + ts.tv_nsec;
} }
bool waitpid_with_timeout(pid_t pid, int timeout_seconds, int* status) {
sigset_t child_mask, old_mask;
sigemptyset(&child_mask);
sigaddset(&child_mask, SIGCHLD);
if (sigprocmask(SIG_BLOCK, &child_mask, &old_mask) == -1) {
printf("*** sigprocmask failed: %s\n", strerror(errno));
return false;
}
struct timespec ts;
ts.tv_sec = timeout_seconds;
ts.tv_nsec = 0;
int ret = TEMP_FAILURE_RETRY(sigtimedwait(&child_mask, NULL, &ts));
int saved_errno = errno;
// Set the signals back the way they were.
if (sigprocmask(SIG_SETMASK, &old_mask, NULL) == -1) {
printf("*** sigprocmask failed: %s\n", strerror(errno));
if (ret == 0) {
return false;
}
}
if (ret == -1) {
errno = saved_errno;
if (errno == EAGAIN) {
errno = ETIMEDOUT;
} else {
printf("*** sigtimedwait failed: %s\n", strerror(errno));
}
return false;
}
pid_t child_pid = waitpid(pid, status, WNOHANG);
if (child_pid != pid) {
if (child_pid != -1) {
printf("*** Waiting for pid %d, got pid %d instead\n", pid, child_pid);
} else {
printf("*** waitpid failed: %s\n", strerror(errno));
}
return false;
}
return true;
}
/* forks a command and waits for it to finish */ /* forks a command and waits for it to finish */
int run_command(const char *title, int timeout_seconds, const char *command, ...) { int run_command(const char *title, int timeout_seconds, const char *command, ...) {
fflush(stdout); fflush(stdout);
@ -345,28 +389,35 @@ int run_command(const char *title, int timeout_seconds, const char *command, ...
} }
/* handle parent case */ /* handle parent case */
for (;;) { int status;
int status; bool ret = waitpid_with_timeout(pid, timeout_seconds, &status);
pid_t p = waitpid(pid, &status, WNOHANG); uint64_t elapsed = nanotime() - start;
int64_t elapsed = nanotime() - start; if (!ret) {
if (p == pid) { if (errno == ETIMEDOUT) {
if (WIFSIGNALED(status)) { printf("*** %s: Timed out after %.3fs (killing pid %d)\n", command,
printf("*** %s: Killed by signal %d\n", command, WTERMSIG(status)); (float) elapsed / NANOS_PER_SEC, pid);
} else if (WIFEXITED(status) && WEXITSTATUS(status) > 0) { } else {
printf("*** %s: Exit code %d\n", command, WEXITSTATUS(status)); printf("*** %s: Error after %.4fs (killing pid %d)\n", command,
(float) elapsed / NANOS_PER_SEC, pid);
}
kill(pid, SIGTERM);
if (!waitpid_with_timeout(pid, 5, NULL)) {
kill(pid, SIGKILL);
if (!waitpid_with_timeout(pid, 5, NULL)) {
printf("*** %s: Cannot kill %d even with SIGKILL.\n", command, pid);
} }
if (title) printf("[%s: %.3fs elapsed]\n\n", command, (float)elapsed / NANOS_PER_SEC);
return status;
} }
return -1;
if (timeout_seconds && elapsed / NANOS_PER_SEC > timeout_seconds) {
printf("*** %s: Timed out after %.3fs (killing pid %d)\n", command, (float) elapsed / NANOS_PER_SEC, pid);
kill(pid, SIGTERM);
return -1;
}
usleep(100000); // poll every 0.1 sec
} }
if (WIFSIGNALED(status)) {
printf("*** %s: Killed by signal %d\n", command, WTERMSIG(status));
} else if (WIFEXITED(status) && WEXITSTATUS(status) > 0) {
printf("*** %s: Exit code %d\n", command, WEXITSTATUS(status));
}
if (title) printf("[%s: %.3fs elapsed]\n\n", command, (float)elapsed / NANOS_PER_SEC);
return status;
} }
size_t num_props = 0; size_t num_props = 0;