diff --git a/package/lean/autocore/Makefile b/package/lean/autocore/Makefile index 47beabca8d..03db79b9f4 100644 --- a/package/lean/autocore/Makefile +++ b/package/lean/autocore/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=autocore PKG_VERSION:=1 -PKG_RELEASE:=26 +PKG_RELEASE:=27 include $(INCLUDE_DIR)/package.mk diff --git a/package/lean/autocore/files/index.htm b/package/lean/autocore/files/index.htm index 1891b26b31..8c48323c18 100644 --- a/package/lean/autocore/files/index.htm +++ b/package/lean/autocore/files/index.htm @@ -51,8 +51,19 @@ local eth_info = luci.sys.exec("ethinfo") local user_info = tonumber(luci.sys.exec("cat /proc/net/arp | grep '0x2' | wc -l")) or 0 + + local cpu_usage + + if fs.readfile("/tmp/cpuusage") then + cpu_usage = luci.sys.exec("cat /tmp/cpuusage") + else + cpu_usage = "6.6%" + end + + luci.sys.exec("/sbin/getcpu &") local rv = { + cpuusage = cpu_usage, cpuinfo = cpu_info, ethinfo = eth_info, userinfo = user_info, @@ -660,6 +671,9 @@ if (e = document.getElementById('cpuinfo')) e.innerHTML = info.cpuinfo; + + if (e = document.getElementById('cpuusage')) + e.innerHTML = info.cpuusage; if (e = document.getElementById('loadavg')) e.innerHTML = String.format( @@ -717,6 +731,7 @@ <%:Local Time%>- <%:Uptime%>- <%:Load Average%>- + <%:CPU Usage%>- diff --git a/package/lean/autocore/files/sbin/getcpu b/package/lean/autocore/files/sbin/getcpu new file mode 100755 index 0000000000..4541477022 --- /dev/null +++ b/package/lean/autocore/files/sbin/getcpu @@ -0,0 +1,7 @@ +#!/bin/sh + +AT=$(cat /proc/stat | grep "^cpu " | awk '{print $2+$3+$4+$5+$6+$7+$8 " " $2+$3+$4+$7+$8}') +sleep 3 +BT=$(cat /proc/stat | grep "^cpu " | awk '{print $2+$3+$4+$5+$6+$7+$8 " " $2+$3+$4+$7+$8}') + +printf "%.01f%%" $(echo $AT $BT | awk '{print (($4-$2)/($3-$1))*100}') >/tmp/cpuusage \ No newline at end of file