Skip to content

Commit efb148c

Browse files
authored
Merge pull request #734 from cobolbaby/master
fix: process_resident_memory_bytes detected is incorrect in Win7 32bit
2 parents 70a94c0 + c6babaf commit efb148c

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

prometheus/process_collector_windows.go

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,22 @@ var (
3333
)
3434

3535
type processMemoryCounters struct {
36-
// https://docs.microsoft.com/en-us/windows/desktop/api/psapi/ns-psapi-_process_memory_counters_ex
36+
// System interface description
37+
// https://docs.microsoft.com/en-us/windows/desktop/api/psapi/ns-psapi-process_memory_counters_ex
38+
39+
// Refer to the Golang internal implementation
40+
// https://golang.org/src/internal/syscall/windows/psapi_windows.go
3741
_ uint32
3842
PageFaultCount uint32
39-
PeakWorkingSetSize uint64
40-
WorkingSetSize uint64
41-
QuotaPeakPagedPoolUsage uint64
42-
QuotaPagedPoolUsage uint64
43-
QuotaPeakNonPagedPoolUsage uint64
44-
QuotaNonPagedPoolUsage uint64
45-
PagefileUsage uint64
46-
PeakPagefileUsage uint64
47-
PrivateUsage uint64
43+
PeakWorkingSetSize uintptr
44+
WorkingSetSize uintptr
45+
QuotaPeakPagedPoolUsage uintptr
46+
QuotaPagedPoolUsage uintptr
47+
QuotaPeakNonPagedPoolUsage uintptr
48+
QuotaNonPagedPoolUsage uintptr
49+
PagefileUsage uintptr
50+
PeakPagefileUsage uintptr
51+
PrivateUsage uintptr
4852
}
4953

5054
func getProcessMemoryInfo(handle windows.Handle) (processMemoryCounters, error) {

0 commit comments

Comments
 (0)