!45 修复issue I3EN1Z 中描述的问题

From: @pocarl
Reviewed-by: @miao_kaibo
Signed-off-by: @miao_kaibo
This commit is contained in:
openeuler-ci-bot 2021-04-29 09:12:59 +08:00 committed by Gitee
commit 6e92ac5b3a
2 changed files with 17 additions and 5 deletions

View File

@ -13,19 +13,28 @@
welcome=$(uname -r) welcome=$(uname -r)
# Memory # Memory
memory_total=$(free -m | awk '/Mem:/ { printf($2)}') memory_total=$(cat /proc/meminfo | awk '/^MemTotal:/ {printf($2)}')
memory_free=$(cat /proc/meminfo | awk '/^MemFree:/ { printf($2)}')
buffers=$(cat /proc/meminfo | awk '/^Buffers:/ { printf($2)}')
cached=$(cat /proc/meminfo | awk '/^Cached:/ { printf($2)}')
sreclaimable=$(cat /proc/meminfo | awk '/^SReclaimable:/ { printf($2)}')
swap_total=$(cat /proc/meminfo | awk '/^SwapTotal:/ { printf($2)}')
swap_free=$(cat /proc/meminfo | awk '/^SwapFree:/ { printf($2)}')
if [ $memory_total -gt 0 ] if [ $memory_total -gt 0 ]
then then
memory_usage=$(free -m | awk '/Mem:/ { printf("%3.1f%%", $3/$2*100)}') memory_usage=`echo "scale=1; ($memory_total - $memory_free - $buffers - $cached - $sreclaimable) * 100.0 / $memory_total" |bc`
memory_usage="${memory_usage}%"
else else
memory_usage=0.0% memory_usage=0.0%
fi fi
# Swap memory # Swap memory
swap_total=$(free -m | awk '/Swap:/ { printf($2)}')
if [ $swap_total -gt 0 ] if [ $swap_total -gt 0 ]
then then
swap_mem=$(free -m | awk '/Swap:/ { printf("%3.1f%%", $3/$2*100)}') swap_mem=`echo "scale=1; ($swap_total - $swap_free) * 100.0 / $swap_total" |bc`
swap_mem="${swap_mem}%"
else else
swap_mem=0.0% swap_mem=0.0%
fi fi

View File

@ -5,7 +5,7 @@
%define dist_release_version 8 %define dist_release_version 8
%define generic_version 20.03 %define generic_version 20.03
%define generic_patch_level LTS %define generic_patch_level LTS
%define generic_release 43 %define generic_release 44
%define builtin_release_version 1.0 %define builtin_release_version 1.0
%define current_arch %{_arch} %define current_arch %{_arch}
@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT
/etc/profile.d/performance.sh /etc/profile.d/performance.sh
%changelog %changelog
* Thu Apr 1 2021 gaochong <gaochong@uniontech.com> - 1.0-44
- get memeroy info from /proc/meminfo instead of command free, fix issue I3EN1Z
* Sat Dec 26 2020 fu_changjie <fuchangjie@kylinos.cn> - 1.0-43 * Sat Dec 26 2020 fu_changjie <fuchangjie@kylinos.cn> - 1.0-43
- Change value of product_family to 2, fix issue I3A6CP - Change value of product_family to 2, fix issue I3A6CP