From d7c99133e1926fa118ae2fd3e7e0b81abf15c610 Mon Sep 17 00:00:00 2001 From: mutlusun Date: Wed, 25 Jan 2017 17:59:52 +0100 Subject: [PATCH] port cpu widget to freebsd --- widgets/cpu_freebsd.lua | 69 ++++++++++++++++++++++++++++++ widgets/{cpu.lua => cpu_linux.lua} | 4 +- 2 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 widgets/cpu_freebsd.lua rename widgets/{cpu.lua => cpu_linux.lua} (94%) diff --git a/widgets/cpu_freebsd.lua b/widgets/cpu_freebsd.lua new file mode 100644 index 0000000..044286c --- /dev/null +++ b/widgets/cpu_freebsd.lua @@ -0,0 +1,69 @@ +-- {{{ Grab environment +local helpers = require("vicious.helpers") +local tonumber = tonumber +local setmetatable = setmetatable +local math = { floor = math.floor } +local string = { gmatch = string.gmatch } +-- }}} + + +-- Cpu: provides CPU usage for all available CPUs/cores +-- vicious.widgets.cpu_freebsd +local cpu_freebsd = {} + +-- Initialize function tables +local cpu_total = {} +local cpu_idle = {} + +-- {{{ CPU widget type +local function worker(format) + local cp_times = helpers.sysctl("kern.cp_times") + local matches = {} + local tmp_total = {} + local tmp_idle = {} + local tmp_usage = {} + + -- Read input data + for v in string.gmatch(cp_times, "([%d]+)") do + table.insert(matches, v) + end + + -- Set first value of function tables + if #cpu_total == 0 then -- check for empty table + for i = 1, #matches / 5 + 1 do + cpu_total[i] = 0 + cpu_idle[i] = 0 + end + end + for i = 1, #matches / 5 + 1 do + tmp_total[i] = 0 + tmp_idle[i] = 0 + tmp_usage[i] = 0 + end + + -- CPU usage + for i, v in ipairs(matches) do + local index = math.floor((i-1) / 5) + 2 -- current cpu + + tmp_total[1] = tmp_total[1] + v + tmp_total[index] = tmp_total[index] + v + + if (i-1) % 5 == 4 then + tmp_idle[1] = tmp_idle[1] + v + tmp_idle[index] = tmp_idle[index] + v + end + end + + for i = 1, #tmp_usage do + tmp_usage[i] = tmp_total[i] - cpu_total[i] + tmp_usage[i] = math.floor((tmp_usage[i] - (tmp_idle[i] - cpu_idle[i])) / tmp_usage[i] * 100) + end + + cpu_total = tmp_total + cpu_idle = tmp_idle + + return tmp_usage +end +-- }}} + +return setmetatable(cpu_freebsd, { __call = function(_, ...) return worker(...) end }) diff --git a/widgets/cpu.lua b/widgets/cpu_linux.lua similarity index 94% rename from widgets/cpu.lua rename to widgets/cpu_linux.lua index fe6754a..99ec1b2 100644 --- a/widgets/cpu.lua +++ b/widgets/cpu_linux.lua @@ -20,7 +20,7 @@ local string = { -- Cpu: provides CPU usage for all available CPUs/cores -- vicious.widgets.cpu -local cpu = {} +local cpu_linux = {} -- Initialize function tables @@ -77,4 +77,4 @@ local function worker(format) end -- }}} -return setmetatable(cpu, { __call = function(_, ...) return worker(...) end }) +return setmetatable(cpu_linux, { __call = function(_, ...) return worker(...) end })