Merge branch 'master' of http://git.sysphere.org/vicious

Conflicts:
	README
	widgets/dio.lua

README

@@ -166,9 +166,9 @@ vicious.widgets.fs
     {/ avail_mb}, {/ avail_gb}, {/ avail_p}, {/home size_mb} etc.
 
 vicious.widgets.dio
-  - provides I/O statistics for storage devices or partitions
+  - provides I/O statistics for all available storage devices
   - returns a table with string keys: {sda total_s}, {sda total_kb},
-    {sda total_mb}, {sda read_s}, {sda read_kb}, {sda read_mb}, 
+    {sda total_mb}, {sda read_s}, {sda read_kb}, {sda read_mb},
     {sda write_s}, {sda write_kb}, {sda write_mb}, {sdb1 total_s} etc.
 
 vicious.widgets.raid

TODO

@@ -6,8 +6,6 @@
 
 * Vicious
 ** TODO Consider commiting power drain support to bat.lua
-** TODO Try replacing dio.lua with io.lua
-*** TODO First io.lua should grab data for all devices
 ** TODO Document contrib widgets in contrib/README
 ** TODO Consider multigraph, graph stacking, support
 ** TODO Complete the hddtemp fix

contrib/README

@@ -27,6 +27,14 @@ vicious.contrib.batpmu
 vicious.contrib.batproc
   -
 
+vicious.contrib.dio
+  - provides I/O statistics for requested storage devices
+  - takes the disk as an argument, i.e. "sda" (or a specific
+    partition, i.e. "sda/sda2")
+  - returns a table with string keys: {total_s}, {total_kb}, {total_mb},
+    {read_s}, {read_kb}, {read_mb}, {write_s}, {write_kb}, {write_mb}
+    and {sched}
+
 vicious.contrib.mpc
   -
 

contrib/dio.lua

@@ -0,0 +1,72 @@
+---------------------------------------------------
+-- Licensed under the GNU General Public License v2
+--  * (c) 2010, Adrian C. <anrxc@sysphere.org>
+---------------------------------------------------
+
+-- {{{ Grab environment
+local ipairs = ipairs
+local setmetatable = setmetatable
+local table = { insert = table.insert }
+local string = { gmatch = string.gmatch }
+local helpers = require("vicious.helpers")
+-- }}}
+
+
+-- Disk I/O: provides I/O statistics for requested storage devices
+module("vicious.contrib.dio")
+
+
+-- Initialize function tables
+local disk_usage = {}
+local disk_total = {}
+-- Variable definitions
+local unit = { ["s"] = 1, ["kb"] = 2, ["mb"] = 2048 }
+
+-- {{{ Disk I/O widget type
+local function worker(format, disk)
+    if not disk then return end
+
+    local disk_lines = { [disk] = {} }
+    local disk_stats = helpers.pathtotable("/sys/block/" .. disk)
+
+    if disk_stats.stat then
+        local match = string.gmatch(disk_stats.stat, "[%s]+([%d]+)")
+        for i = 1, 11 do -- Store disk stats
+            table.insert(disk_lines[disk], match())
+        end
+    end
+
+    -- Ensure tables are initialized correctly
+    local diff_total = { [disk] = {} }
+    if not disk_total[disk] then
+        disk_usage[disk] = {}
+        disk_total[disk] = {}
+
+        while #disk_total[disk] < #disk_lines[disk] do
+            table.insert(disk_total[disk], 0)
+        end
+    end
+
+    for i, v in ipairs(disk_lines[disk]) do
+        -- Diskstats are absolute, substract our last reading
+        diff_total[disk][i] = v - disk_total[disk][i]
+
+        -- Store totals
+        disk_total[disk][i] = v
+    end
+
+    -- Calculate and store I/O
+    helpers.uformat(disk_usage[disk], "read",  diff_total[disk][3], unit)
+    helpers.uformat(disk_usage[disk], "write", diff_total[disk][7], unit)
+    helpers.uformat(disk_usage[disk], "total", diff_total[disk][7] + diff_total[disk][3], unit)
+
+    -- Store I/O scheduler
+    if disk_stats.queue and disk_stats.queue.scheduler then
+        disk_usage[disk]["{sched}"] = string.gmatch(disk_stats.queue.scheduler, "%[([%a]+)%]")
+    end
+
+    return disk_usage[disk]
+end
+-- }}}
+
+setmetatable(_M, { __call = function(_, ...) return worker(...) end })

contrib/init.lua

@@ -9,6 +9,7 @@
 require("vicious.contrib.batacpi")
 require("vicious.contrib.batpmu")
 require("vicious.contrib.batproc")
+require("vicious.contrib.dio")
 require("vicious.contrib.mpc")
 require("vicious.contrib.netcfg")
 require("vicious.contrib.net")

widgets/dio.lua

@@ -4,11 +4,15 @@
 ---------------------------------------------------
 
 -- {{{ Grab environment
-local helpers_uformat = require("vicious.helpers").uformat
-local io = { lines = io.lines }
-local os = { time = os.time, difftime = os.difftime }
 local pairs = pairs
+local io = { lines = io.lines }
 local setmetatable = setmetatable
+local string = { match = string.match }
+local helpers = require("vicious.helpers")
+local os = {
+    time = os.time,
+    difftime = os.difftime
+}
 -- }}}
 
 
@@ -17,56 +21,51 @@ module("vicious.widgets.dio")
 
 
 -- Initialize function tables
-local last_time = 0
-local last_diskstats = {}
+local disk_usage = {}
+local disk_stats = {}
+local disk_time  = 0
 -- Constant definitions
-local UNIT = {["s"] = 1, ["kb"] = 2, ["mb"] = 2048}
-
--- {{{ I/O widget type
-local function read()
-   local lines = {}
-   for l in io.lines("/proc/diskstats") do
-      -- linux kernel doc: Documentation/iostats.txt
-      --   8       0 sda 5328 6084 205232 142076 1295 3162 35178 45946 0 58440 188000
-      --             ^             ^                       ^
-      local device, read, write = l:match("([^%s]+) %d+ %d+ (%d+) %d+ %d+ %d+ (%d+)")
-      lines[device]={read, write}
-   end
-   return lines
-end
+local unit = { ["s"] = 1, ["kb"] = 2, ["mb"] = 2048 }
 
+-- {{{ Disk I/O widget type
 local function worker(format)
-   local diskstats = read()
-   local diskusage = {}
+    local disk_lines = {}
 
-   local time = os.time()
-   local time_diff = os.difftime(time, last_time)
+    for line in io.lines("/proc/diskstats") do
+        local device, read, write =
+            -- Linux kernel documentation: Documentation/iostats.txt
+            string.match(line, "([^%s]+) %d+ %d+ (%d+) %d+ %d+ %d+ (%d+)")
+        disk_lines[device] = { read, write }
+    end
 
-   -- should not happen since the minimum time difference in vicious is 1 sec
-   if time_diff == 0 then time_diff = 1 end
+    local time = os.time()
+    local interval = os.difftime(time, disk_time)
+    if interval == 0 then interval = 1 end
 
-   for device, stats in pairs(diskstats) do
-	   -- ensure, we have last_diskstat to avoid insane values at the startup
-	   local last_stats = last_diskstats[device] or stats
+    for device, stats in pairs(disk_lines) do
+        -- Avoid insane values on startup
+        local last_stats = disk_stats[device] or stats
 
-	   -- Check for overflows and counter resets (> 2^32)
-	   if stats[1] < last_stats[1] or stats[2] < last_stats[2] then
-		   last_stats[1], last_stats[2] = stats[1], stats[2]
-	   end
-	   -- Diskstats are absolute, so substract our last reading
-	   -- dividing by timediff is needed cause we don't know how often the widget is called
-	   local read  = (stats[1] - last_stats[1]) / time_diff
-	   local write = (stats[2] - last_stats[2]) / time_diff
+        -- Check for overflows and counter resets (> 2^32)
+        if stats[1] < last_stats[1] or stats[2] < last_stats[2] then
+            last_stats[1], last_stats[2] = stats[1], stats[2]
+        end
 
-	   -- Calculate and store per disk I/O
-	   helpers_uformat(diskusage, device.." read",  read,  UNIT)
-	   helpers_uformat(diskusage, device.." write", write, UNIT)
-	   helpers_uformat(diskusage, device.." total", read + write, UNIT)
-   end
+        -- Diskstats are absolute, substract our last reading
+        -- * divide by timediff because we don't know the timer value
+        local read  = (stats[1] - last_stats[1]) / interval
+        local write = (stats[2] - last_stats[2]) / interval
 
-   last_time = time
-   last_diskstats = diskstats
-   return diskusage
+        -- Calculate and store I/O
+        helpers.uformat(disk_usage, device.." read",  read,  unit)
+        helpers.uformat(disk_usage, device.." write", write, unit)
+        helpers.uformat(disk_usage, device.." total", read + write, unit)
+    end
+
+    disk_time  = time
+    disk_stats = disk_lines
+
+    return disk_usage
 end
 -- }}}