Title: [230057] trunk/Source/bmalloc
- Revision
- 230057
- Author
- commit-qu...@webkit.org
- Date
- 2018-03-28 16:00:51 -0700 (Wed, 28 Mar 2018)
Log Message
Unreviewed, rolling out r230005.
https://bugs.webkit.org/show_bug.cgi?id=184115
"it caused a huge regression on iOS" (Requested by saamyjoon
on #webkit).
Reverted changeset:
"memoryStatus() is wrong in certain testing scenarios on iOS"
https://bugs.webkit.org/show_bug.cgi?id=184050
https://trac.webkit.org/changeset/230005
Modified Paths
Diff
Modified: trunk/Source/bmalloc/ChangeLog (230056 => 230057)
--- trunk/Source/bmalloc/ChangeLog 2018-03-28 22:50:45 UTC (rev 230056)
+++ trunk/Source/bmalloc/ChangeLog 2018-03-28 23:00:51 UTC (rev 230057)
@@ -1,3 +1,17 @@
+2018-03-28 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r230005.
+ https://bugs.webkit.org/show_bug.cgi?id=184115
+
+ "it caused a huge regression on iOS" (Requested by saamyjoon
+ on #webkit).
+
+ Reverted changeset:
+
+ "memoryStatus() is wrong in certain testing scenarios on iOS"
+ https://bugs.webkit.org/show_bug.cgi?id=184050
+ https://trac.webkit.org/changeset/230005
+
2018-03-27 Saam Barati <sbar...@apple.com>
memoryStatus() is wrong in certain testing scenarios on iOS
Modified: trunk/Source/bmalloc/bmalloc/AvailableMemory.cpp (230056 => 230057)
--- trunk/Source/bmalloc/bmalloc/AvailableMemory.cpp 2018-03-28 22:50:45 UTC (rev 230056)
+++ trunk/Source/bmalloc/bmalloc/AvailableMemory.cpp 2018-03-28 23:00:51 UTC (rev 230057)
@@ -99,12 +99,8 @@
mach_msg_type_number_t vmSize = TASK_VM_INFO_COUNT;
size_t memoryFootprint = 0;
- if (KERN_SUCCESS == task_info(mach_task_self(), TASK_VM_INFO, (task_info_t)(&vmInfo), &vmSize)) {
- // FIXME: Move back to phys_footprint when it works in all of our
- // iOS testing infrastructure:
- // https://bugs.webkit.org/show_bug.cgi?id=184050
- memoryFootprint = static_cast<size_t>(vmInfo.internal) + static_cast<size_t>(vmInfo.compressed);
- }
+ if (KERN_SUCCESS == task_info(mach_task_self(), TASK_VM_INFO, (task_info_t)(&vmInfo), &vmSize))
+ memoryFootprint = static_cast<size_t>(vmInfo.phys_footprint);
double percentInUse = static_cast<double>(memoryFootprint) / static_cast<double>(availableMemory());
double percentAvailableMemoryInUse = std::min(percentInUse, 1.0);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
