Introduce DiskIORateMeter and DiskIOTimeMeter

The two meters are split from DiskIOMeter and they allow separate
display of disk read & write rates and the busy time percentage,
including drawing the data as separate bars and graphs.

The old DiskIOMeter is kept for backward compatibility. It will be
reworked in the next commit.

Note that DiskIORateMeter and DiskIOTimeMeter have different
'isPercentChart' values.

Signed-off-by: Kang-Che Sung <explorer09@gmail.com>

Author: Explorer09

DiskIOMeter.c

@@ -21,14 +21,25 @@ in the source distribution for its full text.
 #include "XUtils.h"
 
 
+static const int DiskIORateMeter_attributes[] = {
+   METER_VALUE_IOREAD,
+   METER_VALUE_IOWRITE,
+};
+
+static const int DiskIOTimeMeter_attributes[] = {
+   METER_VALUE_NOTICE,
+};
+
 static const int DiskIOMeter_attributes[] = {
    METER_VALUE_NOTICE,
    METER_VALUE_IOREAD,
    METER_VALUE_IOWRITE,
 };
 
 static MeterRateStatus status = RATESTATUS_INIT;
+static double cached_read_diff;
 static char cached_read_diff_str[6];
+static double cached_write_diff;
 static char cached_write_diff_str[6];
 static double cached_utilisation_diff;
 static double cached_utilisation_norm;
@@ -73,6 +84,7 @@ static void DiskIOUpdateCache(const Machine* host) {
       } else {
          diff = 0;
       }
+      cached_read_diff = diff;
       Meter_humanUnit(cached_read_diff_str, diff, sizeof(cached_read_diff_str));
 
       if (data.totalBytesWritten > cached_write_total) {
@@ -82,6 +94,7 @@ static void DiskIOUpdateCache(const Machine* host) {
       } else {
          diff = 0;
       }
+      cached_write_diff = diff;
       Meter_humanUnit(cached_write_diff_str, diff, sizeof(cached_write_diff_str));
 
       cached_utilisation_diff = 0.0;
@@ -101,6 +114,97 @@ static void DiskIOUpdateCache(const Machine* host) {
    cached_msTimeSpend_total = data.totalMsTimeSpend;
 }
 
+static void DiskIORateMeter_updateValues(Meter* this) {
+   DiskIOUpdateCache(this->host);
+
+   this->values[0] = cached_read_diff;
+   this->values[1] = cached_write_diff;
+
+   switch (status) {
+      case RATESTATUS_NODATA:
+         xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "no data");
+         return;
+      case RATESTATUS_INIT:
+         xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "init");
+         return;
+      case RATESTATUS_STALE:
+         xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "stale");
+         return;
+      case RATESTATUS_DATA:
+         break;
+   }
+
+   xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "r:%siB/s w:%siB/s", cached_read_diff_str, cached_write_diff_str);
+}
+
+static void DiskIORateMeter_display(ATTR_UNUSED const Object* cast, RichString* out) {
+   switch (status) {
+      case RATESTATUS_NODATA:
+         RichString_writeAscii(out, CRT_colors[METER_VALUE_ERROR], "no data");
+         return;
+      case RATESTATUS_INIT:
+         RichString_writeAscii(out, CRT_colors[METER_VALUE], "initializing...");
+         return;
+      case RATESTATUS_STALE:
+         RichString_writeAscii(out, CRT_colors[METER_VALUE_WARN], "stale data");
+         return;
+      case RATESTATUS_DATA:
+         break;
+   }
+
+   RichString_appendAscii(out, CRT_colors[METER_TEXT], "read: ");
+   RichString_appendAscii(out, CRT_colors[METER_VALUE_IOREAD], cached_read_diff_str);
+   RichString_appendAscii(out, CRT_colors[METER_VALUE_IOREAD], "iB/s");
+
+   RichString_appendAscii(out, CRT_colors[METER_TEXT], " write: ");
+   RichString_appendAscii(out, CRT_colors[METER_VALUE_IOWRITE], cached_write_diff_str);
+   RichString_appendAscii(out, CRT_colors[METER_VALUE_IOWRITE], "iB/s");
+}
+
+static void DiskIOTimeMeter_updateValues(Meter* this) {
+   DiskIOUpdateCache(this->host);
+
+   this->values[0] = cached_utilisation_norm;
+
+   switch (status) {
+      case RATESTATUS_NODATA:
+         xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "no data");
+         return;
+      case RATESTATUS_INIT:
+         xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "init");
+         return;
+      case RATESTATUS_STALE:
+         xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "stale");
+         return;
+      case RATESTATUS_DATA:
+         break;
+   }
+
+   xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "%.1f%%", cached_utilisation_diff);
+}
+
+static void DiskIOTimeMeter_display(ATTR_UNUSED const Object* cast, RichString* out) {
+   switch (status) {
+      case RATESTATUS_NODATA:
+         RichString_writeAscii(out, CRT_colors[METER_VALUE_ERROR], "no data");
+         return;
+      case RATESTATUS_INIT:
+         RichString_writeAscii(out, CRT_colors[METER_VALUE], "initializing...");
+         return;
+      case RATESTATUS_STALE:
+         RichString_writeAscii(out, CRT_colors[METER_VALUE_WARN], "stale data");
+         return;
+      case RATESTATUS_DATA:
+         break;
+   }
+
+   char buffer[16];
+
+   int color = cached_utilisation_diff > 40.0 ? METER_VALUE_NOTICE : METER_VALUE;
+   int len = xSnprintf(buffer, sizeof(buffer), "%.1f%%", cached_utilisation_diff);
+   RichString_appendnAscii(out, CRT_colors[color], buffer, len);
+}
+
 static void DiskIOMeter_updateValues(Meter* this) {
    DiskIOUpdateCache(this->host);
 
@@ -153,6 +257,44 @@ static void DiskIOMeter_display(ATTR_UNUSED const Object* cast, RichString* out)
    RichString_appendAscii(out, CRT_colors[METER_VALUE_IOWRITE], "iB/s");
 }
 
+const MeterClass DiskIORateMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = DiskIORateMeter_display
+   },
+   .updateValues = DiskIORateMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .supportedModes = METERMODE_DEFAULT_SUPPORTED,
+   .maxItems = 2,
+   .isPercentChart = false,
+   .total = 1.0,
+   .attributes = DiskIORateMeter_attributes,
+   .name = "DiskIORate",
+   .uiName = "Disk IO Rate",
+   .description = "Disk IO read & write bytes per second",
+   .caption = "Dsk: "
+};
+
+const MeterClass DiskIOTimeMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = DiskIOTimeMeter_display
+   },
+   .updateValues = DiskIOTimeMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .supportedModes = METERMODE_DEFAULT_SUPPORTED,
+   .maxItems = 1,
+   .isPercentChart = true,
+   .total = 1.0,
+   .attributes = DiskIOTimeMeter_attributes,
+   .name = "DiskIOTime",
+   .uiName = "Disk IO Time",
+   .description = "Disk percent time busy",
+   .caption = "Dsk: "
+};
+
 const MeterClass DiskIOMeter_class = {
    .super = {
       .extends = Class(Meter),

DiskIOMeter.h

@@ -19,6 +19,10 @@ typedef struct DiskIOData_ {
    uint64_t numDisks;
 } DiskIOData;
 
+extern const MeterClass DiskIORateMeter_class;
+
+extern const MeterClass DiskIOTimeMeter_class;
+
 extern const MeterClass DiskIOMeter_class;
 
 #endif /* HEADER_DiskIOMeter */

darwin/Platform.c

@@ -143,6 +143,8 @@ const MeterClass* const Platform_meterTypes[] = {
    &RightCPUs8Meter_class,
    &ZfsArcMeter_class,
    &ZfsCompressedArcMeter_class,
+   &DiskIORateMeter_class,
+   &DiskIOTimeMeter_class,
    &DiskIOMeter_class,
    &NetworkIOMeter_class,
    &FileDescriptorMeter_class,

dragonflybsd/Platform.c

@@ -120,6 +120,8 @@ const MeterClass* const Platform_meterTypes[] = {
    &RightCPUs4Meter_class,
    &LeftCPUs8Meter_class,
    &RightCPUs8Meter_class,
+   &DiskIORateMeter_class,
+   &DiskIOTimeMeter_class,
    &DiskIOMeter_class,
    &NetworkIOMeter_class,
    &FileDescriptorMeter_class,

freebsd/Platform.c

@@ -130,6 +130,8 @@ const MeterClass* const Platform_meterTypes[] = {
    &BlankMeter_class,
    &ZfsArcMeter_class,
    &ZfsCompressedArcMeter_class,
+   &DiskIORateMeter_class,
+   &DiskIOTimeMeter_class,
    &DiskIOMeter_class,
    &FileDescriptorMeter_class,
    &NetworkIOMeter_class,

linux/Platform.c

@@ -247,6 +247,8 @@ const MeterClass* const Platform_meterTypes[] = {
    &ZfsArcMeter_class,
    &ZfsCompressedArcMeter_class,
    &ZramMeter_class,
+   &DiskIORateMeter_class,
+   &DiskIOTimeMeter_class,
    &DiskIOMeter_class,
    &NetworkIOMeter_class,
    &SELinuxMeter_class,

netbsd/Platform.c

@@ -180,6 +180,8 @@ const MeterClass* const Platform_meterTypes[] = {
    &LeftCPUs8Meter_class,
    &RightCPUs8Meter_class,
    &BlankMeter_class,
+   &DiskIORateMeter_class,
+   &DiskIOTimeMeter_class,
    &DiskIOMeter_class,
    &NetworkIOMeter_class,
    &FileDescriptorMeter_class,

pcp/Platform.c

@@ -114,6 +114,8 @@ const MeterClass* const Platform_meterTypes[] = {
    &ZfsArcMeter_class,
    &ZfsCompressedArcMeter_class,
    &ZramMeter_class,
+   &DiskIORateMeter_class,
+   &DiskIOTimeMeter_class,
    &DiskIOMeter_class,
    &NetworkIOMeter_class,
    &SysArchMeter_class,