125 |
|
continue; |
126 |
|
} |
127 |
|
cpu_now.user+=(long long)cs.cpu_sysinfo.cpu[CPU_USER]; |
128 |
– |
cpu_now.iowait+=(long long)cs.cpu_sysinfo.cpu[CPU_WAIT]; |
128 |
|
cpu_now.kernel+=(long long)cs.cpu_sysinfo.cpu[CPU_KERNEL]; |
129 |
|
cpu_now.idle+=(long long)cs.cpu_sysinfo.cpu[CPU_IDLE]; |
130 |
< |
cpu_now.swap+=(long long)cs.cpu_sysinfo.cpu[CPU_STATES]; |
130 |
> |
cpu_now.iowait+=(long long)cs.cpu_sysinfo.wait[W_IO]+(long long)cs.cpu_sysinfo.wait[W_PIO]; |
131 |
> |
cpu_now.swap+=(long long)cs.cpu_sysinfo.wait[W_SWAP]; |
132 |
|
} |
133 |
|
|
134 |
|
cpu_now.total=cpu_now.user+cpu_now.iowait+cpu_now.kernel+cpu_now.idle+cpu_now.swap; |