diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2020-09-19 08:46:16 +0300 |
|---|---|---|
| committer | Hannu Nyman <hannu.nyman@iki.fi> | 2020-09-19 08:46:16 +0300 |
| commit | 4f2ecd88fd02c1279041f45ccd758184b153c875 (patch) | |
| tree | fda183967d2f51b3f3ab6142a74702c2077b8e96 /modules | |
| parent | 509bf29cc9ae96350547946b207c0c0b5f61917f (diff) | |
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 <hannu.nyman@iki.fi>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/luci-base/luasrc/sys.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/luci-base/luasrc/sys.lua b/modules/luci-base/luasrc/sys.lua index c8ad5393e..bf21b5f19 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) |