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

Merge branch 'SIGAR-179'

This commit is contained in:
Doug MacEachern 2009-08-23 15:59:14 -07:00
parent 713e91d59a e3b378ecd1
commit bf1543877a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -726,6 +726,8 @@ static PERF_INSTANCE_DEFINITION *get_cpu_instance(sigar_t *sigar,
return PdhFirstInstance(object); return PdhFirstInstance(object);
} }
#define SPPI_MAX 128 /* XXX unhardcode; should move off this api anyhow */
#define sigar_NtQuerySystemInformation \ #define sigar_NtQuerySystemInformation \
sigar->ntdll.query_sys_info.func sigar->ntdll.query_sys_info.func
@ -744,8 +746,7 @@ static int get_idle_cpu(sigar_t *sigar, sigar_cpu_t *cpu,
DLLMOD_INIT(ntdll, FALSE); DLLMOD_INIT(ntdll, FALSE);
if (sigar_NtQuerySystemInformation) { if (sigar_NtQuerySystemInformation) {
DWORD retval, num; DWORD retval, num;
/* XXX unhardcode 16 */ SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION info[SPPI_MAX];
SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION info[16];
/* into the lungs of hell */ /* into the lungs of hell */
sigar_NtQuerySystemInformation(SystemProcessorPerformanceInformation, sigar_NtQuerySystemInformation(SystemProcessorPerformanceInformation,
&info, sizeof(info), &retval); &info, sizeof(info), &retval);
@ -816,8 +817,7 @@ static int sigar_cpu_ntsys_get(sigar_t *sigar, sigar_cpu_t *cpu)
{ {
DWORD retval, num; DWORD retval, num;
int i; int i;
/* XXX unhardcode 16 */ SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION info[SPPI_MAX];
SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION info[16];
/* into the lungs of hell */ /* into the lungs of hell */
sigar_NtQuerySystemInformation(SystemProcessorPerformanceInformation, sigar_NtQuerySystemInformation(SystemProcessorPerformanceInformation,
&info, sizeof(info), &retval); &info, sizeof(info), &retval);
@ -919,8 +919,7 @@ static int sigar_cpu_list_ntsys_get(sigar_t *sigar,
int status, i, j; int status, i, j;
int core_rollup = sigar_cpu_core_rollup(sigar); int core_rollup = sigar_cpu_core_rollup(sigar);
/* XXX unhardcode 16 */ SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION info[SPPI_MAX];
SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION info[16];
/* into the lungs of hell */ /* into the lungs of hell */
sigar_NtQuerySystemInformation(SystemProcessorPerformanceInformation, sigar_NtQuerySystemInformation(SystemProcessorPerformanceInformation,
&info, sizeof(info), &retval); &info, sizeof(info), &retval);