github/across
1
0
Fork 0
mirror of https://github.com/teddysun/across.git synced 2025-01-19 06:19:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: github:0a5d50b537a079264539094c96cafd6b4d959f22
Branches Tags
github:master
...
compare: github:70f8bd140d02332a3e34f435932b0c9657fd7ae8
Branches Tags
github:master

2 Commits
0a5d50b537 ... 70f8bd140d

Author SHA1 Message Date
Teddysun
70f8bd140d
Update comments 
Added Emojis

Signed-off-by: Teddysun <i@teddysun.com>
 2023-10-16 20:01:41 +09:00
秉虎
28e7865afb
Fixed processor name contains processor string issue (#114) 
When model name contain processor, such as 'Common KVM processor', it will cause a false calculate in processor.
To prevent this, add ^ to make sure it only count the line start with processor.
 2023-10-16 15:50:20 +09:00
1 changed files with 7 additions and 7 deletions
Show Stats Expand all files Collapse all files

14
bench.sh
View File

@ -235,7 +235,7 @@ print_intro() {
# Get System information # Get System information
get_system_info() { get_system_info() {
cname=$(awk -F: '/model name/ {name=$2} END {print name}' /proc/cpuinfo | sed 's/^[ \t]*//;s/[ \t]*$//') cname=$(awk -F: '/model name/ {name=$2} END {print name}' /proc/cpuinfo | sed 's/^[ \t]*//;s/[ \t]*$//')
cores=$(awk -F: '/processor/ {core++} END {print core}' /proc/cpuinfo) cores=$(awk -F: '/^processor/ {core++} END {print core}' /proc/cpuinfo)
freq=$(awk -F'[ :]' '/cpu MHz/ {print $4;exit}' /proc/cpuinfo) freq=$(awk -F'[ :]' '/cpu MHz/ {print $4;exit}' /proc/cpuinfo)
ccache=$(awk -F: '/cache size/ {cache=$2} END {print cache}' /proc/cpuinfo | sed 's/^[ \t]*//;s/[ \t]*$//') ccache=$(awk -F: '/cache size/ {cache=$2} END {print cache}' /proc/cpuinfo | sed 's/^[ \t]*//;s/[ \t]*$//')
cpu_aes=$(grep -i 'aes' /proc/cpuinfo) cpu_aes=$(grep -i 'aes' /proc/cpuinfo)
@ -308,14 +308,14 @@ print_system_info() {
echo " CPU Cache : $(_blue "$ccache")" echo " CPU Cache : $(_blue "$ccache")"
fi fi
if [ -n "$cpu_aes" ]; then if [ -n "$cpu_aes" ]; then
echo " AES-NI : $(_green "Enabled")" echo " AES-NI : $(_green "\xe2\x9c\x93 Enabled")"
else else
echo " AES-NI : $(_red "Disabled")" echo " AES-NI : $(_red "\xe2\x9c\x97 Disabled")"
fi fi
if [ -n "$cpu_virt" ]; then if [ -n "$cpu_virt" ]; then
echo " VM-x/AMD-V : $(_green "Enabled")" echo " VM-x/AMD-V : $(_green "\xe2\x9c\x93 Enabled")"
else else
echo " VM-x/AMD-V : $(_red "Disabled")" echo " VM-x/AMD-V : $(_red "\xe2\x9c\x97 Disabled")"
fi fi
echo " Total Disk : $(_yellow "$disk_total_size") $(_blue "($disk_used_size Used)")" echo " Total Disk : $(_yellow "$disk_total_size") $(_blue "($disk_used_size Used)")"
echo " Total Mem : $(_yellow "$tram") $(_blue "($uram Used)")" echo " Total Mem : $(_yellow "$tram") $(_blue "($uram Used)")"
@ -384,8 +384,8 @@ ipv6_check=$((ping -6 -c 1 -W 4 ipv6.google.com >/dev/null 2>&1 && echo true) ||
if [[ -z "$ipv4_check" && -z "$ipv6_check" ]]; then if [[ -z "$ipv4_check" && -z "$ipv6_check" ]]; then
_yellow "Warning: Both IPv4 and IPv6 connectivity were not detected.\n" _yellow "Warning: Both IPv4 and IPv6 connectivity were not detected.\n"
fi fi
[[ -z "$ipv4_check" ]] && online="$(_red "Offline")" || online="$(_green "Online")" [[ -z "$ipv4_check" ]] && online="$(_red "\xe2\x9c\x97 Offline")" || online="$(_green "\xe2\x9c\x93 Online")"
[[ -z "$ipv6_check" ]] && online+=" / $(_red "Offline")" || online+=" / $(_green "Online")" [[ -z "$ipv6_check" ]] && online+=" / $(_red "\xe2\x9c\x97 Offline")" || online+=" / $(_green "\xe2\x9c\x93 Online")"
start_time=$(date +%s) start_time=$(date +%s)
get_system_info get_system_info
check_virt check_virt