modules/admin-full: Add swap info to admin_status page if swap is available, #533

[project/luci.git] / libs / sys / luasrc / sys.lua

diff --git a/libs/sys/luasrc/sys.lua b/libs/sys/luasrc/sys.lua
index c0fb528..6628524 100644 (file)
--- a/libs/sys/luasrc/sys.lua
+++ b/libs/sys/luasrc/sys.lua
@@ -176,6 +176,9 @@ function sysinfo()
        local memfree = tonumber(meminfo:match("MemFree:%s*(%d+)"))
        local membuffers = tonumber(meminfo:match("Buffers:%s*(%d+)"))
        local bogomips = tonumber(cpuinfo:match("[Bb]ogo[Mm][Ii][Pp][Ss].-: ([^\n]+)")) or 0
+       local swaptotal = tonumber(meminfo:match("SwapTotal:%s*(%d+)"))
+       local swapcached = tonumber(meminfo:match("SwapCached:%s*(%d+)"))
+       local swapfree = tonumber(meminfo:match("SwapFree:%s*(%d+)"))
 
        local system =
                cpuinfo:match("system type\t+: ([^\n]+)") or
@@ -190,7 +193,7 @@ function sysinfo()
                nixio.uname().machine or
                system
 
-       return system, model, memtotal, memcached, membuffers, memfree, bogomips
+       return system, model, memtotal, memcached, membuffers, memfree, bogomips, swaptotal, swapcached, swapfree
 end
 
 --- Retrieves the output of the "logread" command.
@@ -342,17 +345,17 @@ end
 function net.mac_hints(callback)
        if callback then
                _nethints(1, function(mac, v4, v6, name)
-                       name = name or nixio.getnameinfo(v4 or v6) or v4
+                       name = name or nixio.getnameinfo(v4 or v6, nil, 100) or v4
                        if name and name ~= mac then
-                               callback(mac, name or nixio.getnameinfo(v4 or v6) or v4)
+                               callback(mac, name or nixio.getnameinfo(v4 or v6, nil, 100) or v4)
                        end
                end)
        else
                local rv = { }
                _nethints(1, function(mac, v4, v6, name)
-                       name = name or nixio.getnameinfo(v4 or v6) or v4
+                       name = name or nixio.getnameinfo(v4 or v6, nil, 100) or v4
                        if name and name ~= mac then
-                               rv[#rv+1] = { mac, name or nixio.getnameinfo(v4 or v6) or v4 }
+                               rv[#rv+1] = { mac, name or nixio.getnameinfo(v4 or v6, nil, 100) or v4 }
                        end
                end)
                return rv
@@ -366,7 +369,7 @@ end
 function net.ipv4_hints(callback)
        if callback then
                _nethints(2, function(mac, v4, v6, name)
-                       name = name or nixio.getnameinfo(v4) or mac
+                       name = name or nixio.getnameinfo(v4, nil, 100) or mac
                        if name and name ~= v4 then
                                callback(v4, name)
                        end
@@ -374,7 +377,7 @@ function net.ipv4_hints(callback)
        else
                local rv = { }
                _nethints(2, function(mac, v4, v6, name)
-                       name = name or nixio.getnameinfo(v4) or mac
+                       name = name or nixio.getnameinfo(v4, nil, 100) or mac
                        if name and name ~= v4 then
                                rv[#rv+1] = { v4, name }
                        end
@@ -390,7 +393,7 @@ end
 function net.ipv6_hints(callback)
        if callback then
                _nethints(3, function(mac, v4, v6, name)
-                       name = name or nixio.getnameinfo(v6) or mac
+                       name = name or nixio.getnameinfo(v6, nil, 100) or mac
                        if name and name ~= v6 then
                                callback(v6, name)
                        end
@@ -398,7 +401,7 @@ function net.ipv6_hints(callback)
        else
                local rv = { }
                _nethints(3, function(mac, v4, v6, name)
-                       name = name or nixio.getnameinfo(v6) or mac
+                       name = name or nixio.getnameinfo(v6, nil, 100) or mac
                        if name and name ~= v6 then
                                rv[#rv+1] = { v6, name }
                        end
@@ -695,38 +698,29 @@ end
 function process.list()
        local data = {}
        local k
-       local ps = luci.util.execi("top -bn1")
+       local ps = luci.util.execi("/bin/busybox top -bn1")
 
        if not ps then
                return
        end
 
-       while true do
-               local line = ps()
-               if not line then
-                       return
-               end
-
-               k = luci.util.split(luci.util.trim(line), "%s+", nil, true)
-               if k[6] == "%VSZ" then
-                       k[6] = "%MEM"
-               end
-               if k[1] == "PID" then
-                       break
-               end
-       end
-
        for line in ps do
-               local row = {}
-
-               line = luci.util.trim(line)
-               for i, value in ipairs(luci.util.split(line, "%s+", #k-1, true)) do
-                       row[k[i]] = value
-               end
+               local pid, ppid, user, stat, vsz, mem, cpu, cmd = line:match(
+                       "^ *(%d+) +(%d+) +(%S.-%S) +([RSDZTW][W ][<N ]) +(%d+) +(%d+%%) +(%d+%%) +(.+)"
+               )
 
-               local pid = tonumber(row[k[1]])
-               if pid then
-                       data[pid] = row
+               local idx = tonumber(pid)
+               if idx then
+                       data[idx] = {
+                               ['PID']     = pid,
+                               ['PPID']    = ppid,
+                               ['USER']    = user,
+                               ['STAT']    = stat,
+                               ['VSZ']     = vsz,
+                               ['%MEM']    = mem,
+                               ['%CPU']    = cpu,
+                               ['COMMAND'] = cmd
+                       }
                end
        end
 
@@ -836,6 +830,7 @@ function wifi.getiwinfo(ifname)
                local u = uci.cursor_state()
                local d, n = ifname:match("^(%w+)%.network(%d+)")
                if d and n then
+                       ifname = d
                        n = tonumber(n)
                        u:foreach("wireless", "wifi-iface",
                                function(s)