From: Hannu Nyman <redacted>
Date: Sat, 19 Sep 2020 05:46:16 +0000 (+0300)
Subject: luci-base: tweak busybox top regex to accept 'm' in large VSZ
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=4f2ecd88fd02c1279041f45ccd758184b153c875;p=openwrt-luci.git

luci-base: tweak busybox top regex to accept 'm' in large VSZ

Tweak the lua regex string for process list, so that processes
with extremely large memory sizes (over 100 MB) are matched.
For those large processes busybox top shows a MB value like '234m'
instead of a normal kB value like 234000.

Fixes #4425

Reference to https://github.com/openwrt/luci/issues/4425#issuecomment-694073479

Signed-off-by: Hannu Nyman <redacted>
---

diff --git a/modules/luci-base/luasrc/sys.lua b/modules/luci-base/luasrc/sys.lua
index c8ad5393e0..bf21b5f191 100644
--- a/modules/luci-base/luasrc/sys.lua
+++ b/modules/luci-base/luasrc/sys.lua
@@ -379,7 +379,7 @@ function process.list()
 
 	for line in ps do
 		local pid, ppid, user, stat, vsz, mem, cpu, cmd = line:match(
-			"^ *(%d+) +(%d+) +(%S.-%S) +([RSDZTW][<NW ][<N ]) +(%d+) +(%d+%%) +(%d+%%) +(.+)"
+			"^ *(%d+) +(%d+) +(%S.-%S) +([RSDZTW][<NW ][<N ]) +(%d+m?) +(%d+%%) +(%d+%%) +(.+)"
 		)
 
 		local idx = tonumber(pid)