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

add disk rtime and wtime

Browse Source
This commit is contained in:
Doug MacEachern 2007-10-10 02:43:40 +00:00
parent 98157a49ce
commit f37c435ede
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sigar.h
View File

@ -445,6 +445,8 @@ typedef struct {
disk_write_bytes, disk_write_bytes,
disk_read_bytes, disk_read_bytes,
disk_queue, disk_queue,
disk_rtime,
disk_wtime,
disk_time; disk_time;
double use_percent; double use_percent;
} sigar_file_system_usage_t; } sigar_file_system_usage_t;

10
src/os/linux/linux_sigar.c
View File

@ -1379,6 +1379,9 @@ static int get_iostat_proc_dstat(sigar_t *sigar,
&aveq); /* 11 # of millis spent doing I/Os (weighted) */ &aveq); /* 11 # of millis spent doing I/Os (weighted) */
if (num == 11) { if (num == 11) {
fsusage->disk_rtime = ruse;
fsusage->disk_wtime = wuse;
fsusage->disk_time = use;
fsusage->disk_queue = aveq / 1000; fsusage->disk_queue = aveq / 1000;
} }
else if (num == 4) { else if (num == 4) {
@ -1400,8 +1403,6 @@ static int get_iostat_proc_dstat(sigar_t *sigar,
fsusage->disk_read_bytes *= 512; fsusage->disk_read_bytes *= 512;
fsusage->disk_write_bytes *= 512; fsusage->disk_write_bytes *= 512;
fsusage->disk_time = use;
fclose(fp); fclose(fp);
return status; return status;
} }
@ -1454,12 +1455,11 @@ static int get_iostat_procp(sigar_t *sigar,
fsusage->disk_reads = sigar_strtoull(ptr); /* rio */ fsusage->disk_reads = sigar_strtoull(ptr); /* rio */
ptr = sigar_skip_token(ptr); /* rmerge */ ptr = sigar_skip_token(ptr); /* rmerge */
fsusage->disk_read_bytes = sigar_strtoull(ptr); /* rsect */ fsusage->disk_read_bytes = sigar_strtoull(ptr); /* rsect */
ptr = sigar_skip_token(ptr); /* ruse */ fsusage->disk_rtime = sigar_strtoull(ptr); /* ruse */
ptr = sigar_skip_token(ptr); /* wmerge */ ptr = sigar_skip_token(ptr); /* wmerge */
fsusage->disk_write_bytes = sigar_strtoull(ptr); /* wsect */ fsusage->disk_write_bytes = sigar_strtoull(ptr); /* wsect */
fsusage->disk_writes = sigar_strtoull(ptr); /* wio */ fsusage->disk_writes = sigar_strtoull(ptr); /* wio */
ptr = sigar_skip_token(ptr); /* wuse */ fsusage->disk_wtime = sigar_strtoull(ptr); /* wuse */
ptr = sigar_skip_token(ptr); /* running */ ptr = sigar_skip_token(ptr); /* running */
fsusage->disk_time = sigar_strtoull(ptr); /* use */ fsusage->disk_time = sigar_strtoull(ptr); /* use */
fsusage->disk_queue = sigar_strtoull(ptr); /* aveq */ fsusage->disk_queue = sigar_strtoull(ptr); /* aveq */