From 4d5f1033127108d95c4eb32dbae86a4e7b56a8c6 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Sat, 25 Mar 2017 11:51:31 +0100
Subject: [PATCH] Disk read/write IO in background daemon

---
 plugins/dynamix/include/DeviceList.php | 4 ++--
 plugins/dynamix/scripts/diskload       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/dynamix/include/DeviceList.php b/plugins/dynamix/include/DeviceList.php
index 53ee0111d..e5ccdd415 100644
--- a/plugins/dynamix/include/DeviceList.php
+++ b/plugins/dynamix/include/DeviceList.php
@@ -324,8 +324,8 @@ case 'open':
     echo "<td>".device_info($disk)."</td>";
     echo "<td>".device_desc($disk)."</td>";
     echo "<td>".my_temp($disk['temp'])."</td>";
-    echo "<td><span class='diskio'>".my_diskio($data[0])."</span><span class='number'>-</span></td>";
-    echo "<td><span class='diskio'>".my_diskio($data[1])."</span><span class='number'>-</span></td>";
+    echo "<td><span class='diskio'>".my_diskio($data[0])."</span><span class='number'>".my_number($data[2])."</span></td>";
+    echo "<td><span class='diskio'>".my_diskio($data[1])."</span><span class='number'>".my_number($data[3])."</span></td>";
     if (file_exists("/tmp/preclear_stat_$dev")) {
       $text = exec("cut -d'|' -f3 /tmp/preclear_stat_$dev|sed 's:\^n:\<br\>:g'");
       if (strpos($text,'Total time')===false) $text = 'Preclear in progress... '.$text;
diff --git a/plugins/dynamix/scripts/diskload b/plugins/dynamix/scripts/diskload
index b88a2989a..c0a85a96e 100755
--- a/plugins/dynamix/scripts/diskload
+++ b/plugins/dynamix/scripts/diskload
@@ -14,13 +14,13 @@ done
 
 # start daemon
 while :; do
-  stats=($(awk '/(sd[a-z]*|nvme[0-9]n1) /{print $3,$6,$10}' /proc/diskstats))
+  stats=($(awk '/(sd[a-z]*|nvme[0-9]n1) /{print $3,$6,$10,$4,$8}' /proc/diskstats))
   c=0; s=${#stats[@]}
   echo -n >$ini
-  for ((i=0;i<s;i+=3)); do
+  for ((i=0;i<s;i+=5)); do
     reads[c]=$((stats[i+1]-reads[c]))
     writes[c]=$((stats[i+2]-writes[c]))
-    echo ${stats[i]}=$((reads[c]*sector[c]/t)) $((writes[c]*sector[c]/t)) >>$ini
+    echo ${stats[i]}=$((reads[c]*sector[c]/t)) $((writes[c]*sector[c]/t)) ${stats[i+3]} ${stats[i+4]} >>$ini
     reads[c]=${stats[i+1]}
     writes[c]=${stats[i+2]}
     ((c++))