dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[vm/service]: Add VM memory mappings for Windows

Browse Source 
Implement AddVMMappings for Windows using VirtualQuery and
GetMappedFileNameA, matching the existing Linux/Android implementation.

TEST=tested manually on Windows by opening some tool and looking at
values

Fixes: https://github.com/dart-lang/sdk/issues/46166
Change-Id: I2ad9229c1cc39ffedca7a2c0fc50d5e3da36953d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/493020
Commit-Queue: Alexander Aprelev <aam@google.com>
Reviewed-by: Alexander Aprelev <aam@google.com>
Reviewed-by: Ryan Macnak <rmacnak@google.com>
This commit is contained in:
Nourhan
2026-04-15 09:44:59 -07:00
committed by dart-scoped@luci-project-accounts.iam.gserviceaccount.com
parent b9222a8b7d
commit 734e12ac96
1 changed files with 64 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/vm/service.cc
+64
View File
@@ -61,6 +61,10 @@
#include "vm/perfetto_utils.h"
#endif // defined(SUPPORT_PERFETTO)
#if defined(DART_HOST_OS_WINDOWS)
#include <psapi.h>
#endif // defined(DART_HOST_OS_WINDOWS)
namespace dart {
#define Z (T->zone())
@@ -4943,6 +4947,64 @@ static void AddVMMappings(JSONArray* rss_children) {
}
#endif
#if defined(DART_HOST_OS_WINDOWS) && !defined(DART_TARGET_OS_WINDOWS_UWP)
class VMMappingTrait {
public:
struct Pair {
char* path;
size_t size;
};
using Key = char*;
using Value = size_t;
static Key KeyOf(const Pair& kv) { return kv.path; }
static Value ValueOf(const Pair& kv) { return kv.size; }
static uword Hash(Key key) { return Utils::StringHash(key, strlen(key)); }
static bool IsKeyEqual(const Pair& kv, Key key) {
return strcmp(kv.path, key) == 0;
}
};
static void AddVMMappings(JSONArray* rss_children) {
MallocDirectChainedHashMap<VMMappingTrait> mappings;
MEMORY_BASIC_INFORMATION mbi;
uint8_t* address = nullptr;
while (VirtualQuery(address, &mbi, sizeof(mbi)) == sizeof(mbi)) {
if ((mbi.State == MEM_COMMIT) &&
(mbi.Type == MEM_IMAGE || mbi.Type == MEM_MAPPED)) {
char path_buffer[MAX_PATH];
if (GetMappedFileNameA(GetCurrentProcess(), address, path_buffer,
MAX_PATH) != 0) {
auto lookup_result = mappings.Lookup(path_buffer);
if (lookup_result != nullptr) {
lookup_result->size += mbi.RegionSize;
} else {
char* path = strdup(path_buffer);
mappings.Insert({path, mbi.RegionSize});
}
}
}
if (address == nullptr) {
address = reinterpret_cast<uint8_t*>(mbi.RegionSize);
} else {
address += mbi.RegionSize;
}
}
auto it = mappings.GetIterator();
for (auto* pair = it.Next(); pair != nullptr; pair = it.Next()) {
JSONObject mapping(rss_children);
mapping.AddProperty("name", pair->path);
mapping.AddProperty("description",
"Mapped file / shared library / executable");
mapping.AddProperty64("size", pair->size);
JSONArray(&mapping, "children");
free(pair->path);
}
}
#endif
static intptr_t GetProcessMemoryUsageHelper(JSONStream* js) {
JSONObject response(js);
response.AddProperty("type", "ProcessMemoryUsage");
@@ -5053,6 +5115,8 @@ static intptr_t GetProcessMemoryUsageHelper(JSONStream* js) {
#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
AddVMMappings(&rss_children);
#elif defined(DART_HOST_OS_WINDOWS) && !defined(DART_TARGET_OS_WINDOWS_UWP)
AddVMMappings(&rss_children);
#endif
// TODO(46166): Implement for other operating systems.