bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

re-org sigar_disk_usage_t struct

This commit is contained in:
Doug MacEachern 2007-10-13 22:44:20 +00:00
parent 3c5e67a908
commit 0de44bdfbd
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/os/aix/aix_sigar.c
View File

@ -1674,14 +1674,14 @@ static int get_perfstat_disk_metrics(sigar_t *sigar,
return ENOENT; return ENOENT;
} }
fsusage->disk_reads = disk.rblks; fsusage->disk.reads = disk.rblks;
fsusage->disk_writes = disk.wblks; fsusage->disk.writes = disk.wblks;
fsusage->disk_read_bytes = disk.rblks * disk.bsize; fsusage->disk.read_bytes = disk.rblks * disk.bsize;
fsusage->disk_write_bytes = disk.wblks * disk.bsize; fsusage->disk.write_bytes = disk.wblks * disk.bsize;
fsusage->disk_queue = disk.qdepth; fsusage->disk.queue = disk.qdepth;
fsusage->disk_time = disk.time; fsusage->disk.time = disk.time;
fsusage->disk_rtime = SIGAR_FIELD_NOTIMPL; fsusage->disk.rtime = SIGAR_FIELD_NOTIMPL;
fsusage->disk_wtime = SIGAR_FIELD_NOTIMPL; fsusage->disk.wtime = SIGAR_FIELD_NOTIMPL;
return SIGAR_OK; return SIGAR_OK;
} }
@ -1689,18 +1689,18 @@ static int get_perfstat_disk_metrics(sigar_t *sigar,
static void set_disk_metrics(struct dkstat *dkstat, static void set_disk_metrics(struct dkstat *dkstat,
sigar_file_system_usage_t *fsusage) sigar_file_system_usage_t *fsusage)
{ {
fsusage->disk_reads = dkstat->dk_rblks; fsusage->disk.reads = dkstat->dk_rblks;
fsusage->disk_writes = dkstat->dk_wblks; fsusage->disk.writes = dkstat->dk_wblks;
fsusage->disk_read_bytes = dkstat->dk_rblks * dkstat->dk_bsize; fsusage->disk.read_bytes = dkstat->dk_rblks * dkstat->dk_bsize;
fsusage->disk_write_bytes = dkstat->dk_wblks * dkstat->dk_bsize; fsusage->disk.write_bytes = dkstat->dk_wblks * dkstat->dk_bsize;
fsusage->disk_time = dkstat->dk_time; fsusage->disk.time = dkstat->dk_time;
fsusage->disk_rtime = SIGAR_FIELD_NOTIMPL; fsusage->disk.rtime = SIGAR_FIELD_NOTIMPL;
fsusage->disk_wtime = SIGAR_FIELD_NOTIMPL; fsusage->disk.wtime = SIGAR_FIELD_NOTIMPL;
if (dkstat->dk_qd_magic == dk_q_depth_magic) { if (dkstat->dk_qd_magic == dk_q_depth_magic) {
fsusage->disk_queue = dkstat->dk_q_depth; fsusage->disk.queue = dkstat->dk_q_depth;
} }
else { else {
fsusage->disk_queue = SIGAR_FIELD_NOTIMPL; fsusage->disk.queue = SIGAR_FIELD_NOTIMPL;
} }
} }
@ -1794,7 +1794,7 @@ int sigar_file_system_usage_get(sigar_t *sigar,
fsusage->free_files = buf.f_ffree; fsusage->free_files = buf.f_ffree;
fsusage->use_percent = sigar_file_system_usage_calc_used(sigar, fsusage); fsusage->use_percent = sigar_file_system_usage_calc_used(sigar, fsusage);
SIGAR_DISK_STATS_NOTIMPL(fsusage); SIGAR_DISK_STATS_INIT(&fsusage->disk);
if (!sigar->diskmap) { if (!sigar->diskmap) {
status = create_diskmap(sigar); status = create_diskmap(sigar);