re-org sigar_disk_usage_t struct
This commit is contained in:
1 parent
07e4db1d14
commit
4d7e7a3bd7
3 files changed
+59
-53
No files matched your search
+17
-13
@@ -432,22 +432,26 @@ SIGAR_DECLARE(int)
|
||||
sigar_file_system_list_destroy(sigar_t *sigar,
|
||||
sigar_file_system_list_t *fslist);
|
||||
|
||||
#define SIGAR_DISK_USAGE_T \
|
||||
sigar_uint64_t disk_reads; \
|
||||
sigar_uint64_t disk_writes; \
|
||||
sigar_uint64_t disk_write_bytes; \
|
||||
sigar_uint64_t disk_read_bytes; \
|
||||
sigar_uint64_t disk_queue; \
|
||||
sigar_uint64_t disk_rtime; \
|
||||
sigar_uint64_t disk_wtime; \
|
||||
sigar_uint64_t disk_time
|
||||
|
||||
typedef struct {
|
||||
SIGAR_DISK_USAGE_T;
|
||||
sigar_uint64_t reads;
|
||||
sigar_uint64_t writes;
|
||||
sigar_uint64_t write_bytes;
|
||||
sigar_uint64_t read_bytes;
|
||||
sigar_uint64_t queue;
|
||||
sigar_uint64_t rtime;
|
||||
sigar_uint64_t wtime;
|
||||
sigar_uint64_t time;
|
||||
} sigar_disk_usage_t;
|
||||
|
||||
/* XXX for sigar_file_system_usage_t compat */
|
||||
#define disk_reads disk.reads
|
||||
#define disk_writes disk.writes
|
||||
#define disk_write_bytes disk.write_bytes
|
||||
#define disk_read_bytes disk.read_bytes
|
||||
#define disk_queue disk.queue
|
||||
|
||||
typedef struct {
|
||||
SIGAR_DISK_USAGE_T;
|
||||
sigar_disk_usage_t disk;
|
||||
double use_percent;
|
||||
sigar_uint64_t total;
|
||||
sigar_uint64_t free;
|
||||
@@ -466,7 +470,7 @@ sigar_file_system_usage_get(sigar_t *sigar,
|
||||
|
||||
SIGAR_DECLARE(int) sigar_disk_usage_get(sigar_t *sigar,
|
||||
const char *name,
|
||||
sigar_disk_usage_t *usage);
|
||||
sigar_disk_usage_t *disk);
|
||||
|
||||
SIGAR_DECLARE(int)
|
||||
sigar_file_system_ping(sigar_t *sigar,
|
||||
|
||||
@@ -309,10 +309,13 @@ int sigar_group_name_get(sigar_t *sigar, int gid, char *buf, int buflen);
|
||||
return SIGAR_OK; \
|
||||
}
|
||||
|
||||
#define SIGAR_DISK_STATS_INIT(disk) \
|
||||
(disk)->reads = (disk)->writes = \
|
||||
(disk)->read_bytes = (disk)->write_bytes = \
|
||||
(disk)->queue = (disk)->time = SIGAR_FIELD_NOTIMPL;
|
||||
|
||||
#define SIGAR_DISK_STATS_NOTIMPL(fsusage) \
|
||||
fsusage->disk_reads = fsusage->disk_writes = \
|
||||
fsusage->disk_read_bytes = fsusage->disk_write_bytes = \
|
||||
fsusage->disk_queue = fsusage->disk_time = SIGAR_FIELD_NOTIMPL;
|
||||
SIGAR_DISK_STATS_INIT(&fsusage->disk)
|
||||
|
||||
/* key used for filesystem (/) -> device (/dev/hda1) mapping */
|
||||
#define SIGAR_FSDEV_ID(sb) ((sb).st_ino + (sb).st_dev)
|
||||
|
||||
Reference in new issue
Block a user