Title: [234353] branches/safari-606-branch/Source/bmalloc
- Revision
- 234353
- Author
- [email protected]
- Date
- 2018-07-29 23:28:07 -0700 (Sun, 29 Jul 2018)
Log Message
Cherry-pick r234328. rdar://problem/42721215
Explicitly handle memlimit_active < 0
https://bugs.webkit.org/show_bug.cgi?id=188125
Reviewed by Mark Lam.
This may come up during development when someone wants the limit
to be "infinite".
* bmalloc/AvailableMemory.cpp:
(bmalloc::jetsamLimit):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234328 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-606-branch/Source/bmalloc/ChangeLog (234352 => 234353)
--- branches/safari-606-branch/Source/bmalloc/ChangeLog 2018-07-30 06:28:04 UTC (rev 234352)
+++ branches/safari-606-branch/Source/bmalloc/ChangeLog 2018-07-30 06:28:07 UTC (rev 234353)
@@ -1,5 +1,37 @@
2018-07-29 Babak Shafiei <[email protected]>
+ Cherry-pick r234328. rdar://problem/42721215
+
+ Explicitly handle memlimit_active < 0
+ https://bugs.webkit.org/show_bug.cgi?id=188125
+
+ Reviewed by Mark Lam.
+
+ This may come up during development when someone wants the limit
+ to be "infinite".
+
+ * bmalloc/AvailableMemory.cpp:
+ (bmalloc::jetsamLimit):
+
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234328 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-07-27 Saam Barati <[email protected]>
+
+ Explicitly handle memlimit_active < 0
+ https://bugs.webkit.org/show_bug.cgi?id=188125
+
+ Reviewed by Mark Lam.
+
+ This may come up during development when someone wants the limit
+ to be "infinite".
+
+ * bmalloc/AvailableMemory.cpp:
+ (bmalloc::jetsamLimit):
+
+2018-07-29 Babak Shafiei <[email protected]>
+
Cherry-pick r234326. rdar://problem/42721215
Use SPI to compute the jetsam limit on iOS instead of hardcoding 840MB
Modified: branches/safari-606-branch/Source/bmalloc/bmalloc/AvailableMemory.cpp (234352 => 234353)
--- branches/safari-606-branch/Source/bmalloc/bmalloc/AvailableMemory.cpp 2018-07-30 06:28:04 UTC (rev 234352)
+++ branches/safari-606-branch/Source/bmalloc/bmalloc/AvailableMemory.cpp 2018-07-30 06:28:07 UTC (rev 234353)
@@ -82,6 +82,8 @@
pid_t pid = getpid();
if (memorystatus_control(MEMORYSTATUS_CMD_GET_MEMLIMIT_PROPERTIES, pid, 0, &properties, sizeof(properties)))
return 840 * bmalloc::MB;
+ if (properties.memlimit_active < 0)
+ return std::numeric_limits<size_t>::max();
return static_cast<size_t>(properties.memlimit_active) * bmalloc::MB;
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
