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

Accept socket connection before tracing.

Browse Source 
Sometimes dumping threads takes a long time and bugreport times
out. This change will cause us to accept the bugreport socket connection
before dumping threads and should avoid the failed to connect to dumpstate
service problems we've seen.

Bug: 17758374
Change-Id: I80afa0353cf1c340873f481a8d1d7faffff54120
This commit is contained in:
Christopher Ferris 2014-10-01 17:35:01 -07:00
parent 5ee2c9d20c
commit ed9354fc84
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmds/dumpstate/dumpstate.c
View File

@ -438,6 +438,12 @@ int main(int argc, char *argv[]) {
} }
} }
// If we are going to use a socket, do it as early as possible
// to avoid timeouts from bugreport.
if (use_socket) {
redirect_to_socket(stdout, "dumpstate");
}
/* open the vibrator before dropping root */ /* open the vibrator before dropping root */
FILE *vibrator = 0; FILE *vibrator = 0;
if (do_vibrate) { if (do_vibrate) {
@ -504,9 +510,7 @@ int main(int argc, char *argv[]) {
char path[PATH_MAX], tmp_path[PATH_MAX]; char path[PATH_MAX], tmp_path[PATH_MAX];
pid_t gzip_pid = -1; pid_t gzip_pid = -1;
if (use_socket) { if (!use_socket && use_outfile) {
redirect_to_socket(stdout, "dumpstate");
} else if (use_outfile) {
strlcpy(path, use_outfile, sizeof(path)); strlcpy(path, use_outfile, sizeof(path));
if (do_add_date) { if (do_add_date) {
char date[80]; char date[80];