From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Sun, 30 Jun 2019 16:57:31 +0000 (+0300)
Subject: luci-base: show niced processes on Status/Processes page
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9bab4ba3936fe4b52d452af25f79bbfcc3e7761e;p=oweals%2Fluci.git

luci-base: show niced processes on Status/Processes page

Modify the process status filter to allow also the processes
with a nice value to be visible on the Status/Processes page.

Filter out the top process itself.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 1c80eb196282c7119fd26bc03451f4d6ca3710ac)
---

diff --git a/modules/luci-base/luasrc/sys.lua b/modules/luci-base/luasrc/sys.lua
index 823e20770..60762ace8 100644
--- a/modules/luci-base/luasrc/sys.lua
+++ b/modules/luci-base/luasrc/sys.lua
@@ -387,11 +387,11 @@ function process.list()
 
 	for line in ps do
 		local pid, ppid, user, stat, vsz, mem, cpu, cmd = line:match(
-			"^ *(%d+) +(%d+) +(%S.-%S) +([RSDZTW][W ][<N ]) +(%d+) +(%d+%%) +(%d+%%) +(.+)"
+			"^ *(%d+) +(%d+) +(%S.-%S) +([RSDZTW][<NW ][<N ]) +(%d+) +(%d+%%) +(%d+%%) +(.+)"
 		)
 
 		local idx = tonumber(pid)
-		if idx then
+		if idx and not cmd:match("top %-bn1") then
 			data[idx] = {
 				['PID']     = pid,
 				['PPID']    = ppid,