Make dumpstate vibrate immediately.
Previously, the vibration was not performed until after stacks
were gathered which takes a long time. Moved the vibration
to happen earlier so we provide better user feedback for the
three-button salute when collecting a bug report.
Deleted some dead code for playing begin/end sounds.
Improved the timing measurement code to help track down why
bug reports are so slow. (They take over a minute now which
can cause us to lose valuable diagnostic information.)
Bug: 17474152
Change-Id: Iac73f7993d7dc85196aad96f459b22fd4a710f94
diff --git a/cmds/dumpstate/utils.c b/cmds/dumpstate/utils.c
index c8ee75e..e3042eb 100644
--- a/cmds/dumpstate/utils.c
+++ b/cmds/dumpstate/utils.c
@@ -42,6 +42,8 @@
#include "dumpstate.h"
+static const int64_t NANOS_PER_SEC = 1000000000;
+
/* list of native processes to include in the native dumps */
static const char* native_processes_to_dump[] = {
"/system/bin/drmserver",
@@ -293,10 +295,16 @@
return 0;
}
+static int64_t nanotime() {
+ struct timespec ts;
+ clock_gettime(CLOCK_MONOTONIC, &ts);
+ return (int64_t)ts.tv_sec * NANOS_PER_SEC + ts.tv_nsec;
+}
+
/* forks a command and waits for it to finish */
int run_command(const char *title, int timeout_seconds, const char *command, ...) {
fflush(stdout);
- time_t start = time(NULL);
+ int64_t start = nanotime();
pid_t pid = fork();
/* handle error case */
@@ -340,18 +348,18 @@
for (;;) {
int status;
pid_t p = waitpid(pid, &status, WNOHANG);
- time_t elapsed = time(NULL) - start;
+ int64_t elapsed = nanotime() - start;
if (p == pid) {
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: %ds elapsed]\n\n", command, (int) elapsed);
+ if (title) printf("[%s: %.3fs elapsed]\n\n", command, (float)elapsed / NANOS_PER_SEC);
return status;
}
- if (timeout_seconds && elapsed > timeout_seconds) {
+ if (timeout_seconds && elapsed / NANOS_PER_SEC > timeout_seconds) {
printf("*** %s: Timed out after %ds (killing pid %d)\n", command, (int) elapsed, pid);
kill(pid, SIGTERM);
return -1;
@@ -578,9 +586,9 @@
if (!strncmp(data, "/system/bin/app_process", strlen("/system/bin/app_process"))) {
/* skip zygote -- it won't dump its stack anyway */
snprintf(path, sizeof(path), "/proc/%d/cmdline", pid);
- int fd = open(path, O_RDONLY);
- len = read(fd, data, sizeof(data) - 1);
- close(fd);
+ int cfd = open(path, O_RDONLY);
+ len = read(cfd, data, sizeof(data) - 1);
+ close(cfd);
if (len <= 0) {
continue;
}
@@ -590,6 +598,7 @@
}
++dalvik_found;
+ int64_t start = nanotime();
if (kill(pid, SIGQUIT)) {
fprintf(stderr, "kill(%d, SIGQUIT): %s\n", pid, strerror(errno));
continue;
@@ -606,12 +615,24 @@
struct inotify_event ie;
read(ifd, &ie, sizeof(ie));
}
+
+ if (lseek(fd, 0, SEEK_END) < 0) {
+ fprintf(stderr, "lseek: %s\n", strerror(errno));
+ } else {
+ snprintf(data, sizeof(data), "[dump dalvik stack %d: %.3fs elapsed]\n",
+ pid, (float)(nanotime() - start) / NANOS_PER_SEC);
+ write(fd, data, strlen(data));
+ }
} else if (should_dump_native_traces(data)) {
/* dump native process if appropriate */
if (lseek(fd, 0, SEEK_END) < 0) {
fprintf(stderr, "lseek: %s\n", strerror(errno));
} else {
+ int64_t start = nanotime();
dump_backtrace_to_file(pid, fd);
+ snprintf(data, sizeof(data), "[dump native stack %d: %.3fs elapsed]\n",
+ pid, (float)(nanotime() - start) / NANOS_PER_SEC);
+ write(fd, data, strlen(data));
}
}
}
@@ -639,10 +660,6 @@
return result;
}
-void play_sound(const char* path) {
- run_command(NULL, 5, "/system/bin/stagefright", "-o", "-a", path, NULL);
-}
-
void dump_route_tables() {
const char* const RT_TABLES_PATH = "/data/misc/net/rt_tables";
dump_file("RT_TABLES", RT_TABLES_PATH);