From 774306bc25b4b737d318bdd28ab0b078dc60db74 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 7 Jul 2011 14:47:20 -0400
Subject: [PATCH] CHOP-753: have to cast pointer passed to
GetProcessMemoryInfo(). GetProcessMemoryInfo() is prototyped with
PROCESS_MEMORY_COUNTERS*, so to accept PROCESS_MEMORY_COUNTERS_EX* as
documented, have to cast.
---
indra/llcommon/llsys.cpp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index 68566cdbfa6..b3ab5008fb4 100644
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -915,7 +915,13 @@ LLSD LLMemoryInfo::loadStatsArray()
PROCESS_MEMORY_COUNTERS_EX pmem;
pmem.cb = sizeof(pmem);
- GetProcessMemoryInfo(GetCurrentProcess(), &pmem, sizeof(pmem));
+ // GetProcessMemoryInfo() is documented to accept either
+ // PROCESS_MEMORY_COUNTERS* or PROCESS_MEMORY_COUNTERS_EX*, presumably
+ // using the redundant size info to distinguish. But its prototype
+ // specifically accepts PROCESS_MEMORY_COUNTERS*, and since this is a
+ // classic-C API, PROCESS_MEMORY_COUNTERS_EX isn't a subclass. Cast the
+ // pointer.
+ GetProcessMemoryInfo(GetCurrentProcess(), PPROCESS_MEMORY_COUNTERS(&pmem), sizeof(pmem));
stats.add("Page Fault Count", pmem.PageFaultCount);
stats.add("PeakWorkingSetSize KB", pmem.PeakWorkingSetSize/1024);
--
GitLab