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

fix windows 2003 perfdata registry/pdh.dll problem

Browse Source
This commit is contained in:
Doug MacEachern 2005-01-27 02:28:31 +00:00
parent d49a0b720a
commit 9143abc140
1 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,6 +86,7 @@ static PERF_OBJECT_TYPE *get_perf_object(sigar_t *sigar, char *counter_key,
DWORD retval, type, bytes;
WCHAR wcounter_key[MAX_PATH+1];
PERF_DATA_BLOCK *block;
PERF_OBJECT_TYPE *object;
*err = SIGAR_OK;
@ -113,8 +114,30 @@ static PERF_OBJECT_TYPE *get_perf_object(sigar_t *sigar, char *counter_key,
}
block = (PERF_DATA_BLOCK *)sigar->perfbuf;
object = PdhFirstObject(block);
return PdhFirstObject(block);
/*
* only seen on windows 2003 server when pdh.dll
* functions are in use by the same process.
* confucius say what the fuck.
*/
if (object->NumInstances == PERF_NO_INSTANCES) {
bytes =
(block->TotalByteLength -
block->HeaderLength -
object->TotalByteLength);
for (; bytes > 0; bytes -= object->TotalByteLength) {
if (object->NumInstances != PERF_NO_INSTANCES) {
return object;
}
object = PdhNextObject(object);
}
return NULL;
}
else {
return object;
}
}
static void get_sysinfo(sigar_t *sigar)
@ -318,15 +341,6 @@ static PERF_INSTANCE_DEFINITION *get_cpu_instance(sigar_t *sigar,
return NULL;
}
/* XXX dont know why this happens, seen on
* 2003 server mail.hyperic.net
*/
if (object->NumInstances < 1) {
*err = ENOENT;
return NULL;
}
for (i=0, counter = PdhFirstCounter(object);
i<object->NumCounters;
i++, counter = PdhNextCounter(counter))
@ -557,13 +571,6 @@ SIGAR_DECLARE(int) sigar_proc_list_get(sigar_t *sigar,
}
}
/* XXX dont know why this happens, have only
* seen it using 2003 server within vmware.
*/
if (object->NumInstances < 1) {
return ENOENT;
}
sigar_proc_list_create(proclist);
for (i=0, inst = PdhFirstInstance(object);
@ -784,13 +791,6 @@ static int get_proc_info(sigar_t *sigar, sigar_pid_t pid)
return err;
}
/* XXX dont know why this happens, have only
* seen it using 2003 server within vmware.
*/
if (object->NumInstances < 1) {
return ENOENT;
}
pinfo->pid = pid;
pinfo->mtime = timenow;
@ -1353,11 +1353,6 @@ static PERF_INSTANCE_DEFINITION *get_disk_instance(sigar_t *sigar,
return NULL;
}
if (object->NumInstances < 1) {
*err = ENOENT;
return NULL;
}
for (i=0, counter = PdhFirstCounter(object);
i<object->NumCounters;
i++, counter = PdhNextCounter(counter))