CPU Usage: re-detect cores if set to physical or off

This commit is contained in:
Dylan Araps 2017-01-05 10:57:28 +11:00
parent abbf9100b1
commit 7d65ae513d

View file

@ -967,7 +967,7 @@ get_cpu_usage() {
*) *)
# Get CPU cores if unset. # Get CPU cores if unset.
if [[ "$cpu_cores" == "off" ]]; then if [[ "$cpu_cores" != "logical" ]]; then
case "$os" in case "$os" in
"Linux" | "MINIX") cores="$(grep -c "^processor" /proc/cpuinfo)" ;; "Linux" | "MINIX") cores="$(grep -c "^processor" /proc/cpuinfo)" ;;
"Mac OS X") cores="$(sysctl -n hw.logicalcpu_max)" ;; "Mac OS X") cores="$(sysctl -n hw.logicalcpu_max)" ;;
@ -978,7 +978,7 @@ get_cpu_usage() {
esac esac
fi fi
cpu_usage="$(ps aux | awk 'BEGIN {sum=0} {sum+=$3 }; END {print sum}')" cpu_usage="$(ps aux | awk 'BEGIN {sum=0} {sum+=$3}; END {print sum}')"
cpu_usage="$((${cpu_usage/\.*} / ${cores:-1}))" cpu_usage="$((${cpu_usage/\.*} / ${cores:-1}))"
;; ;;
esac esac