commit e7c6e6a3d275cf98788b44bdca56319f987e3211
author mukesh agrawal <quiche@google.com> Wed Jul 27 12:01:49 2016 -0700
committer gitbuildkicker <android-build@google.com> Thu Jul 28 15:07:33 2016 -0700
tree ba56433d5205c588ee11c0197fd22d1123e237a7
parent 9b452caf6786ce6a703340fb5b31c4e7a01af130

dumpsys: fix formatting of service dump times

The current formatting of service dump times is
confusing some bugreport parsing tools. This is
because the current service dump time message
is hard to distinguish from the bugreport section
marker.

Adjust the formatting, to make the service
dump time message distinct from the bugreport
section marker.

BUG=30401031
TEST=manual

Manual test
$ adb bugreport /tmp/bugreport.zip
$ cd /tmp
$ mkdir br
$ mv bugreport.zip br
$ cd br
$ grep 'was the duration' bugreport*.txt
------ 4.283s was the duration of 'DUMPSYS MEMINFO' ------
------ 0.053s was the duration of 'DUMPSYS CPUINFO' ------
[...many lines omitted...]
--------- 0.003s was the duration of dumpsys AtCmdFwd
--------- 0.002s was the duration of dumpsys DockObserver
[...many more lines omitted...]

Change-Id: I9d3dd75210b3984240a4b7ab49a1cc6124a269d8
(cherry picked from commit 50b7e039500b3decc78d5ffff9919d1481df4964)

cmds/dumpsys/dumpsys.cpp

diff --git a/cmds/dumpsys/dumpsys.cpp b/cmds/dumpsys/dumpsys.cpp
index 957a449..d19e98a 100644
--- a/cmds/dumpsys/dumpsys.cpp
+++ b/cmds/dumpsys/dumpsys.cpp
@@ -274,9 +274,8 @@
             if (N > 1) {
               std::chrono::duration<double> elapsed_seconds =
                   std::chrono::steady_clock::now() - start;
-              aout << StringPrintf("------ %.3fs was the duration of '", elapsed_seconds.count()).
-                  c_str();
-              aout << service_name << "' ------" << endl;
+              aout << StringPrintf("--------- %.3fs ", elapsed_seconds.count()).c_str()
+                   << "was the duration of dumpsys " << service_name << endl;
             }
         } else {
             aerr << "Can't find service: " << service_name << endl;