OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
806f23d
)
Fix message when a command times out.
author
Christopher Ferris
<cferris@google.com>
Fri, 9 Jan 2015 23:56:21 +0000
(15:56 -0800)
committer
Christopher Ferris
<cferris@google.com>
Thu, 15 Jan 2015 00:10:11 +0000
(16:10 -0800)
The previous version printed out the nanoseconds elapsed, not seconds.
Bug:
18766581
(cherry picked from commit
67c5a8af9ed128d8bb56d4723303aef6f0a4500f
)
Change-Id: Icbaaee83a92767694fd98e3c790f36f4d24681b0
cmds/dumpstate/utils.c
patch
|
blob
|
history
diff --git
a/cmds/dumpstate/utils.c
b/cmds/dumpstate/utils.c
index
e3042eb
..
81cdd12
100644
(file)
--- 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;
}