diff options
author | Daniel Lange <DLange@git.local> | 2020-12-07 10:26:02 +0100 |
---|---|---|
committer | Daniel Lange <DLange@git.local> | 2020-12-07 10:26:02 +0100 |
commit | d67ee86091f9e07f8d85c1fb77c7c58989e676bb (patch) | |
tree | 900f5e62bfd8e8c082be75a94f5348dea819beba /zfs/ZfsCompressedArcMeter.c | |
parent | 3cbc50cde37fee19ce98ee8260b0a6095b829c4c (diff) | |
parent | 65357c8c46154de4e4eca14075bfe5523bb5fc14 (diff) | |
download | debian_htop-d67ee86091f9e07f8d85c1fb77c7c58989e676bb.tar.gz debian_htop-d67ee86091f9e07f8d85c1fb77c7c58989e676bb.tar.bz2 debian_htop-d67ee86091f9e07f8d85c1fb77c7c58989e676bb.zip |
Update upstream source from tag 'upstream/3.0.3'
Update to upstream version '3.0.3'
with Debian dir 8a3a733dc80e45b1cde220f88fcfd815869742f0
Diffstat (limited to 'zfs/ZfsCompressedArcMeter.c')
-rw-r--r-- | zfs/ZfsCompressedArcMeter.c | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/zfs/ZfsCompressedArcMeter.c b/zfs/ZfsCompressedArcMeter.c index ac3944d..8766f80 100644 --- a/zfs/ZfsCompressedArcMeter.c +++ b/zfs/ZfsCompressedArcMeter.c @@ -1,33 +1,27 @@ /* htop - ZfsCompressedArcMeter.c (C) 2004-2011 Hisham H. Muhammad -Released under the GNU GPL, see the COPYING file +Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ #include "ZfsCompressedArcMeter.h" -#include "ZfsArcStats.h" #include "CRT.h" +#include "Meter.h" +#include "Object.h" #include "Platform.h" +#include "RichString.h" +#include "XUtils.h" -#include <stdlib.h> -#include <string.h> -#include <math.h> -#include <sys/param.h> -#include <assert.h> - -/*{ -#include "ZfsArcStats.h" +#include "zfs/ZfsArcStats.h" -#include "Meter.h" -}*/ -int ZfsCompressedArcMeter_attributes[] = { +static const int ZfsCompressedArcMeter_attributes[] = { ZFS_COMPRESSED }; -void ZfsCompressedArcMeter_readStats(Meter* this, ZfsArcStats* stats) { +void ZfsCompressedArcMeter_readStats(Meter* this, const ZfsArcStats* stats) { if ( stats->isCompressed ) { this->total = stats->uncompressed; this->values[0] = stats->compressed; @@ -38,21 +32,21 @@ void ZfsCompressedArcMeter_readStats(Meter* this, ZfsArcStats* stats) { } } -static void ZfsCompressedArcMeter_printRatioString(Meter* this, char* buffer, int size) { - xSnprintf(buffer, size, "%.2f:1", this->total/this->values[0]); +static void ZfsCompressedArcMeter_printRatioString(const Meter* this, char* buffer, size_t size) { + xSnprintf(buffer, size, "%.2f:1", this->total / this->values[0]); } -static void ZfsCompressedArcMeter_updateValues(Meter* this, char* buffer, int size) { +static void ZfsCompressedArcMeter_updateValues(Meter* this, char* buffer, size_t size) { Platform_setZfsCompressedArcValues(this); ZfsCompressedArcMeter_printRatioString(this, buffer, size); } -static void ZfsCompressedArcMeter_display(Object* cast, RichString* out) { - char buffer[50]; - Meter* this = (Meter*)cast; +static void ZfsCompressedArcMeter_display(const Object* cast, RichString* out) { + const Meter* this = (const Meter*)cast; if (this->values[0] > 0) { + char buffer[50]; Meter_humanUnit(buffer, this->total, 50); RichString_append(out, CRT_colors[METER_VALUE], buffer); RichString_append(out, CRT_colors[METER_TEXT], " Uncompressed, "); @@ -68,7 +62,7 @@ static void ZfsCompressedArcMeter_display(Object* cast, RichString* out) { } } -MeterClass ZfsCompressedArcMeter_class = { +const MeterClass ZfsCompressedArcMeter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete, |