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

old NtQuerySystemInformation works as expected for cpu metrics, use it instead of perflib

Browse Source
This commit is contained in:
Doug MacEachern 2005-02-18 20:03:52 +00:00
parent b8b1d2668d
commit f7a1567a9f
1 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/os/win32/win32_sigar.c
View File

@ -411,7 +411,7 @@ static int get_idle_cpu(sigar_t *sigar, sigar_cpu_t *cpu,
return SIGAR_OK; return SIGAR_OK;
} }
SIGAR_DECLARE(int) sigar_cpu_get(sigar_t *sigar, sigar_cpu_t *cpu) static int sigar_cpu_perflib_get(sigar_t *sigar, sigar_cpu_t *cpu)
{ {
int status; int status;
PERF_INSTANCE_DEFINITION *inst; PERF_INSTANCE_DEFINITION *inst;
@ -446,6 +446,41 @@ SIGAR_DECLARE(int) sigar_cpu_get(sigar_t *sigar, sigar_cpu_t *cpu)
return SIGAR_OK; return SIGAR_OK;
} }
static int sigar_cpu_ntsys_get(sigar_t *sigar, sigar_cpu_t *cpu)
{
DWORD retval, num;
int i;
/* XXX unhardcode 16 */
SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION info[16];
/* into the lungs of hell */
sigar->get_ntsys_info(SystemProcessorPerformanceInformation,
&info, sizeof(info), &retval);
if (!retval) {
return GetLastError();
}
num = retval/sizeof(info[0]);
SIGAR_ZERO(cpu);
for (i=0; i<num; i++) {
cpu->idle += info[i].IdleTime.QuadPart;
cpu->user += info[i].UserTime.QuadPart;
cpu->sys += info[i].KernelTime.QuadPart - info[i].IdleTime.QuadPart;
}
return SIGAR_OK;
}
SIGAR_DECLARE(int) sigar_cpu_get(sigar_t *sigar, sigar_cpu_t *cpu)
{
if (sigar->get_ntsys_info) {
return sigar_cpu_ntsys_get(sigar, cpu);
}
else {
return sigar_cpu_perflib_get(sigar, cpu);
}
}
SIGAR_DECLARE(int) sigar_cpu_list_get(sigar_t *sigar, sigar_cpu_list_t *cpulist) SIGAR_DECLARE(int) sigar_cpu_list_get(sigar_t *sigar, sigar_cpu_list_t *cpulist)
{ {
int status, i, j, hthread=0; int status, i, j, hthread=0;