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

fix get_perf_object, ReqQuery was shrinking the sigar->perfbuf_size

This commit is contained in:
Doug MacEachern 2004-08-09 21:46:34 +00:00
parent 859db1fb9e
commit 948b456433
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,11 +60,11 @@ typedef enum {
RegQueryValueExW(sigar->handle, \ RegQueryValueExW(sigar->handle, \
wcounter_key, NULL, &type, \ wcounter_key, NULL, &type, \
sigar->perfbuf, \ sigar->perfbuf, \
&sigar->perfbuf_size) : \ &bytes) : \
RegQueryValueExA(sigar->handle, \ RegQueryValueExA(sigar->handle, \
counter_key, NULL, &type, \ counter_key, NULL, &type, \
sigar->perfbuf, \ sigar->perfbuf, \
&sigar->perfbuf_size)) &bytes))
#define PERF_VAL(ix) \ #define PERF_VAL(ix) \
perf_offsets[ix] ? \ perf_offsets[ix] ? \
@ -73,7 +73,7 @@ typedef enum {
static PERF_OBJECT_TYPE *get_perf_object(sigar_t *sigar, char *counter_key, static PERF_OBJECT_TYPE *get_perf_object(sigar_t *sigar, char *counter_key,
DWORD *err) DWORD *err)
{ {
DWORD retval, type; DWORD retval, type, bytes;
WCHAR wcounter_key[MAX_PATH+1]; WCHAR wcounter_key[MAX_PATH+1];
PERF_DATA_BLOCK *block; PERF_DATA_BLOCK *block;
@ -88,10 +88,11 @@ static PERF_OBJECT_TYPE *get_perf_object(sigar_t *sigar, char *counter_key,
SIGAR_A2W(counter_key, wcounter_key, sizeof(wcounter_key)); SIGAR_A2W(counter_key, wcounter_key, sizeof(wcounter_key));
} }
bytes = sigar->perfbuf_size;
while ((retval = MyRegQueryValue()) != ERROR_SUCCESS) { while ((retval = MyRegQueryValue()) != ERROR_SUCCESS) {
if (retval == ERROR_MORE_DATA) { if (retval == ERROR_MORE_DATA) {
sigar->perfbuf_size += PERFBUF_SIZE; sigar->perfbuf_size += PERFBUF_SIZE;
bytes = sigar->perfbuf_size;
sigar->perfbuf = sigar->perfbuf =
realloc(sigar->perfbuf, sigar->perfbuf_size); realloc(sigar->perfbuf, sigar->perfbuf_size);
} }