(SIGAR-148) use sigar_statvfs
This commit is contained in:
parent
b53121d071
commit
376409a403
|
@ -1058,7 +1058,6 @@ int sigar_thread_cpu_get(sigar_t *sigar,
|
|||
}
|
||||
|
||||
#include <mntent.h>
|
||||
#include <sys/statfs.h>
|
||||
|
||||
int sigar_os_fs_type_get(sigar_file_system_t *fsp)
|
||||
{
|
||||
|
@ -1458,31 +1457,16 @@ int sigar_disk_usage_get(sigar_t *sigar, const char *name,
|
|||
return status;
|
||||
}
|
||||
|
||||
#include <sys/vfs.h>
|
||||
|
||||
#define SIGAR_FS_BLOCKS_TO_BYTES(val, bsize) ((val * bsize) >> 1)
|
||||
|
||||
int sigar_file_system_usage_get(sigar_t *sigar,
|
||||
const char *dirname,
|
||||
sigar_file_system_usage_t *fsusage)
|
||||
{
|
||||
struct statfs buf;
|
||||
sigar_uint64_t val, bsize;
|
||||
|
||||
if (statfs(dirname, &buf) != 0) {
|
||||
return errno;
|
||||
int status = sigar_statvfs(sigar, dirname, fsusage);
|
||||
|
||||
if (status != SIGAR_OK) {
|
||||
return status;
|
||||
}
|
||||
|
||||
bsize = buf.f_bsize / 512;
|
||||
val = buf.f_blocks;
|
||||
fsusage->total = SIGAR_FS_BLOCKS_TO_BYTES(val, bsize);
|
||||
val = buf.f_bfree;
|
||||
fsusage->free = SIGAR_FS_BLOCKS_TO_BYTES(val, bsize);
|
||||
val = buf.f_bavail;
|
||||
fsusage->avail = SIGAR_FS_BLOCKS_TO_BYTES(val, bsize);
|
||||
fsusage->used = fsusage->total - fsusage->free;
|
||||
fsusage->files = buf.f_files;
|
||||
fsusage->free_files = buf.f_ffree;
|
||||
fsusage->use_percent = sigar_file_system_usage_calc_used(sigar, fsusage);
|
||||
|
||||
(void)sigar_disk_usage_get(sigar, dirname, &fsusage->disk);
|
||||
|
|
Loading…
Reference in New Issue