luci-base: show niced processes on Status/Processes page
authorHannu Nyman <hannu.nyman@iki.fi>
Sun, 30 Jun 2019 16:57:31 +0000 (19:57 +0300)
committerHannu Nyman <hannu.nyman@iki.fi>
Sun, 30 Jun 2019 16:57:31 +0000 (19:57 +0300)
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)

modules/luci-base/luasrc/sys.lua

index 823e20770c2d90635436a7c54be3c5e2618c6068..60762ace88d8f09ff05c599c8b6ae3cb95eb5d36 100644 (file)
@@ -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,