Changeset 211241 in webkit

Timestamp:

Jan 26, 2017 4:56:44 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: iOS: Memory timeline shows impossible values for Page size (underflowed)
​https://bugs.webkit.org/show_bug.cgi?id=167468
<rdar://problem/30099051>

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2017-01-26
Reviewed by Andreas Kling.

• page/cocoa/ResourceUsageThreadCocoa.mm:

(WebCore::vmPageSize):
This value matches the sysctl value we were attempting to access, and is
the most appropriate when dealing with mach APIs, as we are using here.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/cocoa/ResourceUsageThreadCocoa.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-01-26  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: iOS: Memory timeline shows impossible values for Page size (underflowed)
+        https://bugs.webkit.org/show_bug.cgi?id=167468
+        <rdar://problem/30099051>
+
+        Reviewed by Andreas Kling.
+
+        * page/cocoa/ResourceUsageThreadCocoa.mm:
+        (WebCore::vmPageSize):
+        This value matches the sysctl value we were attempting to access, and is
+        the most appropriate when dealing with mach APIs, as we are using here.
+
 2017-01-26  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm

@@ -35 +35 @@
 #include <mach/vm_statistics.h>
 #include <runtime/VM.h>
-#include <sys/sysctl.h>
 
 namespace WebCore {
@@ -41 +40 @@
 static size_t vmPageSize()
 {
-    static size_t pageSize;
-    static std::once_flag onceFlag;
-    std::call_once(onceFlag, [&] {
-        size_t outputSize = sizeof(pageSize);
-        int status = sysctlbyname("vm.pagesize", &pageSize, &outputSize, nullptr, 0);
-        ASSERT_UNUSED(status, status != -1);
-        ASSERT(pageSize);
-    });
-    return pageSize;
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
+    return vm_kernel_page_size;
+#else
+    static size_t cached = sysconf(_SC_PAGESIZE);
+    return cached;
+#endif
 }