StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enhance 'stacks' script to handle native processes." into klp-dev

Browse Source
This commit is contained in:
Jeff Brown
2013-08-21 00:29:46 +00:00
committed by Android (Google) Code Review
parent 0dcef01e1e b12c2e531c
commit 91efe6bbb7
1 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
envsetup.sh
View File

@@ -845,12 +845,22 @@ function stacks()
if [[ $1 =~ ^[0-9]+$ ]] ; then if [[ $1 =~ ^[0-9]+$ ]] ; then
local PID="$1" local PID="$1"
elif [ "$1" ] ; then elif [ "$1" ] ; then
local PID=$(pid $1) local PIDLIST="$(pid $1)"
if [[ $PIDLIST =~ ^[0-9]+$ ]] ; then
local PID="$PIDLIST"
elif [ "$PIDLIST" ] ; then
echo "more than one process: $1"
else
echo "no such process: $1"
fi
else else
echo "usage: stacks [pid|process name]" echo "usage: stacks [pid|process name]"
fi fi
if [ "$PID" ] ; then if [ "$PID" ] ; then
# Determine whether the process is native
if adb shell ls -l /proc/$PID/exe | grep -q /system/bin/app_process ; then
# Dump stacks of Dalvik process
local TRACES=/data/anr/traces.txt local TRACES=/data/anr/traces.txt
local ORIG=/data/anr/traces.orig local ORIG=/data/anr/traces.orig
local TMP=/data/anr/traces.tmp local TMP=/data/anr/traces.tmp
@@ -864,12 +874,16 @@ function stacks()
# Dump stacks and wait for dump to finish # Dump stacks and wait for dump to finish
adb shell kill -3 $PID adb shell kill -3 $PID
adb shell notify $TRACES adb shell notify $TRACES >/dev/null
# Restore original stacks, and show current output # Restore original stacks, and show current output
adb shell mv $TRACES $TMP adb shell mv $TRACES $TMP
adb shell mv $ORIG $TRACES adb shell mv $ORIG $TRACES
adb shell cat $TMP | less -S adb shell cat $TMP
else
# Dump stacks of native process
adb shell debuggerd -b $PID
fi
fi fi
} }