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

[SIGAR-26] Change Pdh.getFormattedValue() to collect 2 counters if needed

This commit is contained in:
Doug MacEachern 2006-12-04 19:45:00 +00:00
parent d4f10e9cc7
commit 228ee133be
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,4 +1,8 @@
2006-12-03 Doug MacEachern <dougm@hyperic.net> 2006-12-04 Doug MacEachern <dougm@hyperic.com>
* [SIGAR-26] Change Pdh.getFormattedValue() to collect 2 counters if needed
2006-12-03 Doug MacEachern <dougm@hyperic.com>
* [SIGAR-19] Change cpu time units to milliseconds * [SIGAR-19] Change cpu time units to milliseconds

9
bindings/java/src/jni/win32/pdh.c
View File

@ -173,10 +173,19 @@ JNIEXPORT jdouble SIGAR_JNI(win32_Pdh_pdhGetValue)
} }
if (fmt) { if (fmt) {
/* may require 2 counters, see msdn docs */
int i=0;
for (i=0; i<2; i++) {
status = PdhGetFormattedCounterValue(h_counter, status = PdhGetFormattedCounterValue(h_counter,
PDH_FMT_DOUBLE, PDH_FMT_DOUBLE,
(LPDWORD)NULL, (LPDWORD)NULL,
&fmt_value); &fmt_value);
if (status == ERROR_SUCCESS) {
break;
}
PdhCollectQueryData(h_query);
}
} }
else { else {
status = PdhGetRawCounterValue(h_counter, &type, &raw_value); status = PdhGetRawCounterValue(h_counter, &type, &raw_value);