diff options
author | Adrian C. (anrxc) <anrxc@sysphere.org> | 2009-10-02 23:31:46 +0200 |
---|---|---|
committer | Adrian C. (anrxc) <anrxc@sysphere.org> | 2009-10-02 23:32:21 +0200 |
commit | bdc31d01fe9486fee73ec2d49b6cd89380ef7b3d (patch) | |
tree | 20a4bbce49897b514f5f1842b7aa348cc64356d7 /cpuinf.lua | |
parent | 7ec8f2f2f801bfe0ac1996d4101bc60f47f33f14 (diff) | |
download | vicious-legacy-bdc31d01fe9486fee73ec2d49b6cd89380ef7b3d.tar.xz |
cpuinf: prepend 'cpu' to CPU ID in table keys
Keys like cpu0 are more suitable, because they match cpufreq widget
arguments. Instead of old format strings, like: ${0 mhz} now use:
${cpu0 mhz}
Diffstat (limited to 'cpuinf.lua')
-rw-r--r-- | cpuinf.lua | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -16,10 +16,9 @@ module("vicious.cpuinf") -- {{{ CPU Information widget type local function worker(format) - cpu_id = nil - -- Get cpuinfo local f = io.open("/proc/cpuinfo") + local cpu_id = nil local cpu_info = {} for line in f:lines() do @@ -27,12 +26,12 @@ local function worker(format) cpu_id = line:match("([%d]+)") elseif line:match("^cpu MHz.*") then local cpu_speed = line:match("([%d]+)%.") - cpu_info["{"..cpu_id.." mhz}"] = cpu_speed - cpu_info["{"..cpu_id.." ghz}"] = tonumber(cpu_speed) / 1000 + cpu_info["{cpu"..cpu_id.." mhz}"] = cpu_speed + cpu_info["{cpu"..cpu_id.." ghz}"] = tonumber(cpu_speed) / 1000 elseif line:match("^cache size.*") then local cpu_cache = line:match("([%d]+)[%s]KB") - cpu_info["{"..cpu_id.." kb}"] = cpu_cache - cpu_info["{"..cpu_id.." mb}"] = tonumber(cpu_cache) / 1024 + cpu_info["{cpu"..cpu_id.." kb}"] = cpu_cache + cpu_info["{cpu"..cpu_id.." mb}"] = tonumber(cpu_cache) / 1024 end end f:close() |