Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-02-04 21:18:33 +00:00
Code Issues Releases Activity

Make $fs_used_perc and $fs_bar report used space correctly

Browse Source 
they reported fs->size - fs->avail, which is not correct if fs has super-user reserved blocks.

note that now $fs_used_perc and $fs_free_perc need not add up to 100%, but that is consistent
with what $fs_used and $fs_free do.
This commit is contained in:
Pavel Labath 2010-08-12 20:41:28 +02:00
parent 699d6bed40
commit 14511b19ea
1 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/fs.cc
View File

@ -216,31 +216,30 @@ void init_fs_bar(struct text_object *obj, const char *arg)
obj->data.opaque = prepare_fs_stat(arg); obj->data.opaque = prepare_fs_stat(arg);
} }
static double do_fs_barval(struct text_object *obj, int be_free_bar) static double get_fs_perc(struct text_object *obj, bool get_free)
{ {
double val = 1.0; struct fs_stat *fs = static_cast<struct fs_stat *>(obj->data.opaque);
struct fs_stat *fs = (struct fs_stat *)obj->data.opaque; double ret = 0.0;
if (!fs) if(fs && fs->size) {
return 0; if(get_free)
ret = fs->avail;
else
ret = fs->size - fs->free;
ret /= fs->size;
}
if (fs->size) return ret;
val = (double)fs->avail / fs->size;
if (!be_free_bar)
val = 1.0 - val;
return val;
} }
double fs_barval(struct text_object *obj) double fs_barval(struct text_object *obj)
{ {
return do_fs_barval(obj, 0); return get_fs_perc(obj, false);
} }
double fs_free_barval(struct text_object *obj) double fs_free_barval(struct text_object *obj)
{ {
return do_fs_barval(obj, 1); return get_fs_perc(obj, true);
} }
void init_fs(struct text_object *obj, const char *arg) void init_fs(struct text_object *obj, const char *arg)
@ -248,31 +247,14 @@ void init_fs(struct text_object *obj, const char *arg)
obj->data.opaque = prepare_fs_stat(arg ? arg : "/"); obj->data.opaque = prepare_fs_stat(arg ? arg : "/");
} }
static uint8_t fs_percentage(struct text_object *obj, int be_free)
{
struct fs_stat *fs = (struct fs_stat *)obj->data.opaque;
int val = 100;
if (!fs)
return 0;
if (fs->size)
val = fs->avail * 100 / fs->size;
if (!be_free)
val = 100 - val;
return val;
}
uint8_t fs_free_percentage(struct text_object *obj) uint8_t fs_free_percentage(struct text_object *obj)
{ {
return fs_percentage(obj, 1); return get_fs_perc(obj, true) * 100;
} }
uint8_t fs_used_percentage(struct text_object *obj) uint8_t fs_used_percentage(struct text_object *obj)
{ {
return fs_percentage(obj, 0); return get_fs_perc(obj, false) * 100;
} }
#define HUMAN_PRINT_FS_GENERATOR(name, expr) \ #define HUMAN_PRINT_FS_GENERATOR(name, expr) \