diff options
| author | Christopher Ferris <cferris@google.com> | 2015-01-12 18:48:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-12 18:48:23 +0000 |
| commit | d8dc9405c3d5bb2cc20950ed8d6fe25c1239e8e1 (patch) | |
| tree | 2b24b3752db923efb7fc4077bacdcf7455ac7950 /cmds | |
| parent | 2f70741547b39b6ec5bf46220427baccc5e570cb (diff) | |
| parent | 4f9bfffe23d40fdaabe91ea7c7691e52800edb79 (diff) | |
| download | frameworks_native-d8dc9405c3d5bb2cc20950ed8d6fe25c1239e8e1.zip frameworks_native-d8dc9405c3d5bb2cc20950ed8d6fe25c1239e8e1.tar.gz frameworks_native-d8dc9405c3d5bb2cc20950ed8d6fe25c1239e8e1.tar.bz2 | |
am 4f9bfffe: Merge "Fix message when a command times out."
* commit '4f9bfffe23d40fdaabe91ea7c7691e52800edb79':
Fix message when a command times out.
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/dumpstate/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/dumpstate/utils.c b/cmds/dumpstate/utils.c index e3042eb..81cdd12 100644 --- a/cmds/dumpstate/utils.c +++ b/cmds/dumpstate/utils.c @@ -360,7 +360,7 @@ int run_command(const char *title, int timeout_seconds, const char *command, ... } if (timeout_seconds && elapsed / NANOS_PER_SEC > timeout_seconds) { - printf("*** %s: Timed out after %ds (killing pid %d)\n", command, (int) elapsed, pid); + printf("*** %s: Timed out after %.3fs (killing pid %d)\n", command, (float) elapsed / NANOS_PER_SEC, pid); kill(pid, SIGTERM); return -1; } |