|
@@ -967,7 +967,7 @@ get_cpu_usage() {
|
|
|
|
|
|
*)
|
|
|
# Get CPU cores if unset.
|
|
|
- if [[ "$cpu_cores" == "off" ]]; then
|
|
|
+ if [[ "$cpu_cores" != "logical" ]]; then
|
|
|
case "$os" in
|
|
|
"Linux" | "MINIX") cores="$(grep -c "^processor" /proc/cpuinfo)" ;;
|
|
|
"Mac OS X") cores="$(sysctl -n hw.logicalcpu_max)" ;;
|
|
@@ -978,7 +978,7 @@ get_cpu_usage() {
|
|
|
esac
|
|
|
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}))"
|
|
|
;;
|
|
|
esac
|