diff options
author | Christopher Ferris <cferris@google.com> | 2014-10-02 01:11:56 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-02 01:11:57 +0000 |
commit | a91968fd099378d1673c7443be16adcb97ee40af (patch) | |
tree | 3a90a0db727ff404cdf0cfc5611c7a5dedd793e6 | |
parent | db57cfbd6f9d5795846ef237fd297cb81e429679 (diff) | |
parent | ed9354fc846895dc53397fbb5323bef00b3a3834 (diff) | |
download | native-a91968fd099378d1673c7443be16adcb97ee40af.tar.gz |
Merge "Accept socket connection before tracing." into lmp-dev
-rw-r--r-- | cmds/dumpstate/dumpstate.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c index f142095c71..1fbcef6cf4 100644 --- a/cmds/dumpstate/dumpstate.c +++ b/cmds/dumpstate/dumpstate.c @@ -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 */ FILE *vibrator = 0; if (do_vibrate) { @@ -504,9 +510,7 @@ int main(int argc, char *argv[]) { char path[PATH_MAX], tmp_path[PATH_MAX]; pid_t gzip_pid = -1; - if (use_socket) { - redirect_to_socket(stdout, "dumpstate"); - } else if (use_outfile) { + if (!use_socket && use_outfile) { strlcpy(path, use_outfile, sizeof(path)); if (do_add_date) { char date[80]; |