Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1976)

Unified Diff: Source/wtf/PageAllocator.cpp

Issue 408483004: Avoid fragmenting address space on small windows systems. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Justin's nit. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/wtf/PageAllocator.cpp
diff --git a/Source/wtf/PageAllocator.cpp b/Source/wtf/PageAllocator.cpp
index 182a76ce2b99e1b5bf9e122ba1c2a134b9c9003d..a3150eb1710b28323a7894343a5ec6aa93156089 100644
--- a/Source/wtf/PageAllocator.cpp
+++ b/Source/wtf/PageAllocator.cpp
@@ -58,6 +58,29 @@
namespace WTF {
+#if OS(WIN)
+
+static bool shouldUseAddressHint()
+{
+#if !CPU(X86_64)
Chris Evans 2014/07/21 18:02:53 Nit: probably clearer with the new-ish: #if CPU(32
+ // When running 32-bit processes under 32-bit Windows, the userspace is
+ // limited to 2 GB, and we risk fragmenting it badly if we allow further
+ // randomization via our address hint. On the other hand, if the process
+ // is running under WOW64, then it has at least 3 GB available (and likely
+ // 4 GB depending upon the OS version), and we want use the additional
+ // randomness.
+ static BOOL bIsWow64 = -1;
+ if (bIsWow64 == -1) {
+ IsWow64Process(GetCurrentProcess(), &bIsWow64);
+ }
+ return !!bIsWow64;
+#else // !CPU(X86_64)
+ return true;
+#endif // !CPU(X86_64)
+}
+
+#endif // OS(WIN)
+
// This simple internal function wraps the OS-specific page allocation call so
// that it behaves consistently: the address is a hint and if it cannot be used,
// the allocation will be placed elsewhere.
@@ -65,9 +88,10 @@ static void* systemAllocPages(void* addr, size_t len)
{
ASSERT(!(len & kPageAllocationGranularityOffsetMask));
ASSERT(!(reinterpret_cast<uintptr_t>(addr) & kPageAllocationGranularityOffsetMask));
- void* ret;
+ void* ret = 0;
#if OS(WIN)
- ret = VirtualAlloc(addr, len, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE);
+ if (shouldUseAddressHint())
+ ret = VirtualAlloc(addr, len, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE);
if (!ret)
ret = VirtualAlloc(0, len, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE);
#else
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698