diff options
| author | Jahdiel Alvarez <jahdiel@google.com> | 2023-05-03 16:56:12 -0700 |
|---|---|---|
| committer | Jahdiel Alvarez <jahdiel@google.com> | 2023-05-06 00:10:57 +0000 |
| commit | 834f86251b2d9efe30627009f081ae48f924740b (patch) | |
| tree | f27e2bacbe572b326d007e2401e55b48108df9c2 /boottime_tools | |
| parent | c87b4619908209cae2c2f7ca3efb4a1875e688d3 (diff) | |
| download | extras-834f86251b2d9efe30627009f081ae48f924740b.tar.gz | |
Added ADB_REBOOT (-a) flag to bootanalyze script
bootanalyze.py accepts the -a flag, which tells the script to use 'adb
reboot' command instead of 'adb shell su root svc power reboot'. Added
flag in bootanalyze.sh, in order to propagate it to the python script.
Test: ANDROID_BUILD_TOP=<path-android-top> CONFIG_YAML=<path-to-config>
LOOPS=3 RESULTS_DIR=<results-dir>
$ANDROID_BUILD_TOP/system/extras/boottime_tools/bootanalyze/bootanalyze.sh
Bug: 280683562
Change-Id: Iebefdcf50a3b5d28fd4230d37301651c12bf670f
Diffstat (limited to 'boottime_tools')
| -rwxr-xr-x | boottime_tools/bootanalyze/bootanalyze.sh | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/boottime_tools/bootanalyze/bootanalyze.sh b/boottime_tools/bootanalyze/bootanalyze.sh index a21db967..bada4656 100755 --- a/boottime_tools/bootanalyze/bootanalyze.sh +++ b/boottime_tools/bootanalyze/bootanalyze.sh @@ -25,6 +25,7 @@ CONFIG_YMAL="$ANDROID_BUILD_TOP/system/extras/boottime_tools/bootanalyze/config. $ANDROID_BUILD_TOP/system/extras/boottime_tools/bootanalyze/bootanalyze.sh Flags: +-a : Uses "adb reboot" (instead of "adb shell su root svc power reboot") command to reboot -b : If set grabs bootchart -w : If set grabs carwatchdog perf stats ' @@ -52,11 +53,15 @@ fi echo "RESULTS_DIR=$RESULTS_DIR" mkdir -p $RESULTS_DIR +ADB_REBOOT_FLAG="" BOOTCHART_FLAG="" CARWATCHDOG_FLAG="" -while getopts 'bw' OPTION; do +while getopts 'abw' OPTION; do case "$OPTION" in + a) + ADB_REBOOT_FLAG="-a" + ;; b) BOOTCHART_FLAG="-b" ;; @@ -78,6 +83,7 @@ if [[ -z $LOOPS ]]; then LOOPS=1 fi echo "Analyzing boot-time for LOOPS=$LOOPS" +BOOTCHART_TGZ="/tmp/android-bootchart/bootchart.tgz" START=1 SLEEP_SEC=20 @@ -85,9 +91,17 @@ for (( l=$START; l<=$LOOPS; l++ )); do echo "Loop: $l" SECONDS=0 mkdir $RESULTS_DIR/$l - $SCRIPT_DIR/bootanalyze.py -c $CONFIG_YMAL -G 4M -r $BOOTCHART_FLAG $CARWATCHDOG_FLAG -o "$RESULTS_DIR/$l" > "$RESULTS_DIR/$l/boot.txt" + $SCRIPT_DIR/bootanalyze.py -c $CONFIG_YMAL -G 4M -r \ + $ADB_REBOOT_FLAG $BOOTCHART_FLAG $CARWATCHDOG_FLAG \ + -o "$RESULTS_DIR/$l" 1> "$RESULTS_DIR/$l/boot.txt" + if [[ $? -ne 0 ]]; then + echo "bootanalyze.py failed" + exit 1 + fi echo "$SECONDS sec." - cp /tmp/android-bootchart/bootchart.tgz "$RESULTS_DIR/$l/bootchart.tgz" + if [ -f "$BOOTCHART_TGZ" ]; then + cp $BOOTCHART_TGZ "$RESULTS_DIR/$l/bootchart.tgz" + fi echo "Sleep for $SLEEP_SEC sec." sleep $SLEEP_SEC done |