Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (234645 => 234646)
--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2018-08-07 09:40:52 UTC (rev 234645)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2018-08-07 10:01:18 UTC (rev 234646)
@@ -632,6 +632,7 @@
E3A32BC21FC830E2007D7E76 /* JSValueMalloc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSValueMalloc.cpp; sourceTree = "<group>"; };
E3A32BC31FC830E2007D7E76 /* JSValueMalloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSValueMalloc.h; sourceTree = "<group>"; };
E3E158251EADA53C004A079D /* SystemFree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystemFree.h; sourceTree = "<group>"; };
+ E431CC4A21187ADB000C8A07 /* DispatchSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DispatchSPI.h; sourceTree = "<group>"; };
E4A0AD371A96245500536DF6 /* WorkQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkQueue.cpp; sourceTree = "<group>"; };
E4A0AD381A96245500536DF6 /* WorkQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkQueue.h; sourceTree = "<group>"; };
E4A0AD3C1A96253C00536DF6 /* WorkQueueCocoa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkQueueCocoa.cpp; sourceTree = "<group>"; };
@@ -1287,6 +1288,7 @@
isa = PBXGroup;
children = (
DE5A09FB1BA36992003D4424 /* CommonCryptoSPI.h */,
+ E431CC4A21187ADB000C8A07 /* DispatchSPI.h */,
93DDE9311CDC052D00FD3491 /* dyldSPI.h */,
A5098AFF1C169E0700087797 /* SandboxSPI.h */,
CE73E02419DCB7AB00580D5C /* XPCSPI.h */,
Modified: trunk/Source/WTF/wtf/cocoa/MemoryPressureHandlerCocoa.mm (234645 => 234646)
--- trunk/Source/WTF/wtf/cocoa/MemoryPressureHandlerCocoa.mm 2018-08-07 09:40:52 UTC (rev 234645)
+++ trunk/Source/WTF/wtf/cocoa/MemoryPressureHandlerCocoa.mm 2018-08-07 10:01:18 UTC (rev 234646)
@@ -30,6 +30,7 @@
#import <mach/task_info.h>
#import <malloc/malloc.h>
#import <notify.h>
+#import <wtf/spi/darwin/DispatchSPI.h>
#define ENABLE_FMW_FOOTPRINT_COMPARISON 0
@@ -46,9 +47,9 @@
}
}
-static dispatch_source_t _cache_event_source = 0;
-static dispatch_source_t _timer_event_source = 0;
-static int _notifyTokens[3];
+static dispatch_source_t memoryPressureEventSource = nullptr;
+static dispatch_source_t timerEventSource = nullptr;
+static int notifyTokens[3];
// Disable memory event reception for a minimum of s_minimumHoldOffTime
// seconds after receiving an event. Don't let events fire any sooner than
@@ -63,41 +64,51 @@
void MemoryPressureHandler::install()
{
- if (m_installed || _timer_event_source)
+ if (m_installed || timerEventSource)
return;
dispatch_async(dispatch_get_main_queue(), ^{
#if PLATFORM(IOS)
- _cache_event_source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYPRESSURE, 0, DISPATCH_MEMORYPRESSURE_NORMAL | DISPATCH_MEMORYPRESSURE_WARN | DISPATCH_MEMORYPRESSURE_CRITICAL, dispatch_get_main_queue());
-#elif PLATFORM(MAC)
- _cache_event_source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYPRESSURE, 0, DISPATCH_MEMORYPRESSURE_CRITICAL, dispatch_get_main_queue());
+ auto memoryStatusFlags = DISPATCH_MEMORYPRESSURE_NORMAL | DISPATCH_MEMORYPRESSURE_WARN | DISPATCH_MEMORYPRESSURE_CRITICAL | DISPATCH_MEMORYPRESSURE_PROC_LIMIT_WARN | DISPATCH_MEMORYPRESSURE_PROC_LIMIT_CRITICAL;
+#else // PLATFORM(MAC)
+ auto memoryStatusFlags = DISPATCH_MEMORYPRESSURE_CRITICAL;
#endif
+ memoryPressureEventSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYPRESSURE, 0, memoryStatusFlags, dispatch_get_main_queue());
- dispatch_set_context(_cache_event_source, this);
- dispatch_source_set_event_handler(_cache_event_source, ^{
- bool critical = true;
+ dispatch_source_set_event_handler(memoryPressureEventSource, ^{
+ auto status = dispatch_source_get_data(memoryPressureEventSource);
#if PLATFORM(IOS)
- unsigned long status = dispatch_source_get_data(_cache_event_source);
- critical = status == DISPATCH_MEMORYPRESSURE_CRITICAL;
- auto& memoryPressureHandler = MemoryPressureHandler::singleton();
- bool wasCritical = memoryPressureHandler.isUnderMemoryPressure();
- memoryPressureHandler.setUnderMemoryPressure(critical);
- if (status == DISPATCH_MEMORYPRESSURE_NORMAL) {
- if (ReliefLogger::loggingEnabled())
- NSLog(@"System is no longer under (%s) memory pressure.", wasCritical ? "critical" : "non-critical");
- return;
+ switch (status) {
+ // VM pressure events.
+ case DISPATCH_MEMORYPRESSURE_NORMAL:
+ setUnderMemoryPressure(false);
+ break;
+ case DISPATCH_MEMORYPRESSURE_WARN:
+ setUnderMemoryPressure(false);
+ respondToMemoryPressure(Critical::No);
+ break;
+ case DISPATCH_MEMORYPRESSURE_CRITICAL:
+ setUnderMemoryPressure(true);
+ respondToMemoryPressure(Critical::Yes);
+ break;
+ // Process memory limit events.
+ case DISPATCH_MEMORYPRESSURE_PROC_LIMIT_WARN:
+ respondToMemoryPressure(Critical::No);
+ break;
+ case DISPATCH_MEMORYPRESSURE_PROC_LIMIT_CRITICAL:
+ respondToMemoryPressure(Critical::Yes);
+ break;
}
-
- if (ReliefLogger::loggingEnabled())
- NSLog(@"Got memory pressure notification (%s)", critical ? "critical" : "non-critical");
+#else // PLATFORM(MAC)
+ respondToMemoryPressure(Critical::Yes);
#endif
- MemoryPressureHandler::singleton().respondToMemoryPressure(critical ? Critical::Yes : Critical::No);
+ WTFLogAlways("Received memory pressure event %lu vm pressure %d", status, isUnderMemoryPressure());
});
- dispatch_resume(_cache_event_source);
+ dispatch_resume(memoryPressureEventSource);
});
// Allow simulation of memory pressure with "notifyutil -p org.WebKit.lowMemory"
- notify_register_dispatch("org.WebKit.lowMemory", &_notifyTokens[0], dispatch_get_main_queue(), ^(int) {
+ notify_register_dispatch("org.WebKit.lowMemory", ¬ifyTokens[0], dispatch_get_main_queue(), ^(int) {
#if ENABLE(FMW_FOOTPRINT_COMPARISON)
auto footprintBefore = pagesPerVMTag();
#endif
@@ -116,10 +127,10 @@
});
});
- notify_register_dispatch("org.WebKit.lowMemory.begin", &_notifyTokens[1], dispatch_get_main_queue(), ^(int) {
+ notify_register_dispatch("org.WebKit.lowMemory.begin", ¬ifyTokens[1], dispatch_get_main_queue(), ^(int) {
beginSimulatedMemoryPressure();
});
- notify_register_dispatch("org.WebKit.lowMemory.end", &_notifyTokens[2], dispatch_get_main_queue(), ^(int) {
+ notify_register_dispatch("org.WebKit.lowMemory.end", ¬ifyTokens[2], dispatch_get_main_queue(), ^(int) {
endSimulatedMemoryPressure();
});
@@ -132,20 +143,20 @@
return;
dispatch_async(dispatch_get_main_queue(), ^{
- if (_cache_event_source) {
- dispatch_source_cancel(_cache_event_source);
- _cache_event_source = 0;
+ if (memoryPressureEventSource) {
+ dispatch_source_cancel(memoryPressureEventSource);
+ memoryPressureEventSource = nullptr;
}
- if (_timer_event_source) {
- dispatch_source_cancel(_timer_event_source);
- _timer_event_source = 0;
+ if (timerEventSource) {
+ dispatch_source_cancel(timerEventSource);
+ timerEventSource = nullptr;
}
});
m_installed = false;
- for (auto& token : _notifyTokens)
+ for (auto& token : notifyTokens)
notify_cancel(token);
}
@@ -152,20 +163,20 @@
void MemoryPressureHandler::holdOff(Seconds seconds)
{
dispatch_async(dispatch_get_main_queue(), ^{
- _timer_event_source = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, dispatch_get_main_queue());
- if (_timer_event_source) {
- dispatch_set_context(_timer_event_source, this);
+ timerEventSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, dispatch_get_main_queue());
+ if (timerEventSource) {
+ dispatch_set_context(timerEventSource, this);
// FIXME: The final argument `s_minimumHoldOffTime.seconds()` seems wrong.
// https://bugs.webkit.org/show_bug.cgi?id=183277
- dispatch_source_set_timer(_timer_event_source, dispatch_time(DISPATCH_TIME_NOW, seconds.seconds() * NSEC_PER_SEC), DISPATCH_TIME_FOREVER, s_minimumHoldOffTime.seconds());
- dispatch_source_set_event_handler(_timer_event_source, ^{
- if (_timer_event_source) {
- dispatch_source_cancel(_timer_event_source);
- _timer_event_source = 0;
+ dispatch_source_set_timer(timerEventSource, dispatch_time(DISPATCH_TIME_NOW, seconds.seconds() * NSEC_PER_SEC), DISPATCH_TIME_FOREVER, s_minimumHoldOffTime.seconds());
+ dispatch_source_set_event_handler(timerEventSource, ^{
+ if (timerEventSource) {
+ dispatch_source_cancel(timerEventSource);
+ timerEventSource = nullptr;
}
MemoryPressureHandler::singleton().install();
});
- dispatch_resume(_timer_event_source);
+ dispatch_resume(timerEventSource);
}
});
}
Added: trunk/Source/WTF/wtf/spi/darwin/DispatchSPI.h (0 => 234646)
--- trunk/Source/WTF/wtf/spi/darwin/DispatchSPI.h (rev 0)
+++ trunk/Source/WTF/wtf/spi/darwin/DispatchSPI.h 2018-08-07 10:01:18 UTC (rev 234646)
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2018 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#include <dispatch/private.h>
+
+#else
+
+enum {
+ DISPATCH_MEMORYPRESSURE_PROC_LIMIT_WARN = 0x10,
+ DISPATCH_MEMORYPRESSURE_PROC_LIMIT_CRITICAL = 0x20,
+};
+
+#endif
