!149 Replace calculation tool from bc to expr
From: @wang--ge Reviewed-by: @overweight Signed-off-by: @overweight
This commit is contained in:
commit
75c66be269
@ -12,6 +12,39 @@
|
||||
# Welcome
|
||||
welcome=$(uname -r)
|
||||
|
||||
#function
|
||||
function get_mem_usage {
|
||||
differ=`expr $1 - $2 - $3 - $4 - $5`
|
||||
milli=`expr $differ \* 10000 / $1`
|
||||
percent=`expr $differ \* 1000 / $1`
|
||||
predominant=`expr $differ \* 100 / $1`
|
||||
|
||||
round=`expr $milli % 10`
|
||||
if [ ${round} -ge 5 ];then
|
||||
mid=`expr $percent % 10`
|
||||
last=`expr $mid + 1`
|
||||
else
|
||||
last=`expr $percent % 10`
|
||||
fi
|
||||
echo "${predominant}.${last}%"
|
||||
}
|
||||
|
||||
function get_swap_mem {
|
||||
swap_diff=`expr $1 - $2`
|
||||
swap_milli=`expr $swap_diff \* 10000 / $1`
|
||||
swap_percent=`expr $swap_diff \* 1000 / $1`
|
||||
swap_dominant=`expr $swap_diff \* 100 / $1`
|
||||
|
||||
swap_round=`expr $swap_milli %10`
|
||||
if [ ${round} -ge 5 ];then
|
||||
swap_mid=`expr $swap_percent % 10`
|
||||
swap_last=`expr $swap_mid + 1`
|
||||
else
|
||||
swap_last=`expr $swap_percent % 10`
|
||||
fi
|
||||
echo "${swap_dominant}.${swap_last}%"
|
||||
}
|
||||
|
||||
# Memory
|
||||
memory_total=$(cat /proc/meminfo | awk '/^MemTotal:/ {printf($2)}')
|
||||
memory_free=$(cat /proc/meminfo | awk '/^MemFree:/ { printf($2)}')
|
||||
@ -23,8 +56,7 @@ swap_free=$(cat /proc/meminfo | awk '/^SwapFree:/ { printf($2)}')
|
||||
|
||||
if [[ $memory_total -gt 0 ]]
|
||||
then
|
||||
memory_usage=`echo "scale=1; ($memory_total - $memory_free - $buffers - $cached - $sreclaimable) * 100.0 / $memory_total" |bc`
|
||||
memory_usage="${memory_usage}%"
|
||||
memory_usage=`get_mem_usage $memory_total $memory_free $buffers $cached $sreclaimable`
|
||||
else
|
||||
memory_usage=0.0%
|
||||
fi
|
||||
@ -32,8 +64,7 @@ fi
|
||||
# Swap memory
|
||||
if [[ $swap_total -gt 0 ]]
|
||||
then
|
||||
swap_mem=`echo "scale=1; ($swap_total - $swap_free) * 100.0 / $swap_total" |bc`
|
||||
swap_mem="${swap_mem}%"
|
||||
swap_mem=`get_swap_mem $swap_total $swap_free`
|
||||
else
|
||||
swap_mem=0.0%
|
||||
fi
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
%define generic_version 20.03
|
||||
%define generic_patch_level LTS
|
||||
%define generic_patch_level_extend SP4
|
||||
%define generic_release 55
|
||||
%define generic_release 56
|
||||
%define builtin_release_version 1.0
|
||||
|
||||
%define current_arch %{_arch}
|
||||
@ -206,6 +206,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%files -n %{product_family}-release-custom
|
||||
|
||||
%changelog
|
||||
* Thu Nov 09 2023 Ge Wang <wang__ge@126.com> - 1.0-56
|
||||
- replace calculate tool from dc to expr
|
||||
|
||||
* Fri Oct 20 2023 wangchong <wangchong56@h-partners.com> - 1.0-55
|
||||
- modify release for openEuler-20.03-LTS-SP4
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user