Changeset 254254 in webkit

Timestamp:

Jan 9, 2020, 3:47:31 AM (7 years ago)

Author:

ddkilzer@apple.com

Message:

WebKitTestRunner leaks objects in a top-level autoreleasePool that's never cleared
<​https://webkit.org/b/205950>
<rdar://problem/50987831>

Reviewed by Joseph Pecoraro.

Source/WebKit:

• UIProcess/mac/WebPreferencesMac.mm:

(WebKit::WebPreferences::platformInitializeStore):

• Add an @autoreleasepool block around the contents of this method since it generates numerous autoreleased objects when run.

Tools:

• WebKitTestRunner/ios/mainIOS.mm:

(main):

• Add an @autoreleasepool block around a line of code that generates autoreleased objects. These objects would never be released for the life of the process prior to this change.
• WebKitTestRunner/mac/main.mm:

(main):

• Move instantiation of WTR::TestController outside of @autoreleasepool block so the pool can be drained while running tests. Prior to this change, this autoreleasePool would never be drained.

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/mac/WebPreferencesMac.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/ios/mainIOS.mm (modified) (1 diff)
• Tools/WebKitTestRunner/mac/main.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-01-09  David Kilzer  <ddkilzer@apple.com>
+
+        WebKitTestRunner leaks objects in a top-level autoreleasePool that's never cleared
+        <https://webkit.org/b/205950>
+        <rdar://problem/50987831>
+
+        Reviewed by Joseph Pecoraro.
+
+        * UIProcess/mac/WebPreferencesMac.mm:
+        (WebKit::WebPreferences::platformInitializeStore):
+        - Add an @autoreleasepool block around the contents of
+          this method since it generates numerous autoreleased
+          objects when run.
+
 2020-01-08  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/WebKit/UIProcess/mac/WebPreferencesMac.mm

@@ -139 +139 @@
 void WebPreferences::platformInitializeStore()
 {
+    @autoreleasepool {
 #define INITIALIZE_DEBUG_PREFERENCE_FROM_NSUSERDEFAULTS(KeyUpper, KeyLower, TypeName, Type, DefaultValue, HumanReadableName, HumanReadableDescription) \
-    setDebug##TypeName##ValueIfInUserDefaults(m_identifier, m_keyPrefix, m_globalDebugKeyPrefix, WebPreferencesKey::KeyLower##Key(), m_store);
-
-    FOR_EACH_WEBKIT_DEBUG_PREFERENCE(INITIALIZE_DEBUG_PREFERENCE_FROM_NSUSERDEFAULTS)
+        setDebug##TypeName##ValueIfInUserDefaults(m_identifier, m_keyPrefix, m_globalDebugKeyPrefix, WebPreferencesKey::KeyLower##Key(), m_store);
+
+        FOR_EACH_WEBKIT_DEBUG_PREFERENCE(INITIALIZE_DEBUG_PREFERENCE_FROM_NSUSERDEFAULTS)
 
 #undef INITIALIZE_DEBUG_PREFERENCE_FROM_NSUSERDEFAULTS
 
-    if (!m_identifier)
-        return;
+        if (!m_identifier)
+            return;
 
 #define INITIALIZE_PREFERENCE_FROM_NSUSERDEFAULTS(KeyUpper, KeyLower, TypeName, Type, DefaultValue, HumanReadableName, HumanReadableDescription) \
-    Type user##KeyUpper##Value; \
-    if (platformGet##TypeName##UserValueForKey(WebPreferencesKey::KeyLower##Key(), user##KeyUpper##Value)) \
-        m_store.set##TypeName##ValueForKey(WebPreferencesKey::KeyLower##Key(), user##KeyUpper##Value);
-
-    FOR_EACH_WEBKIT_PREFERENCE(INITIALIZE_PREFERENCE_FROM_NSUSERDEFAULTS)
+        Type user##KeyUpper##Value; \
+        if (platformGet##TypeName##UserValueForKey(WebPreferencesKey::KeyLower##Key(), user##KeyUpper##Value)) \
+            m_store.set##TypeName##ValueForKey(WebPreferencesKey::KeyLower##Key(), user##KeyUpper##Value);
+
+        FOR_EACH_WEBKIT_PREFERENCE(INITIALIZE_PREFERENCE_FROM_NSUSERDEFAULTS)
 
 #undef INITIALIZE_PREFERENCE_FROM_NSUSERDEFAULTS
+    }
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2020-01-09  David Kilzer  <ddkilzer@apple.com>
+
+        WebKitTestRunner leaks objects in a top-level autoreleasePool that's never cleared
+        <https://webkit.org/b/205950>
+        <rdar://problem/50987831>
+
+        Reviewed by Joseph Pecoraro.
+
+        * WebKitTestRunner/ios/mainIOS.mm:
+        (main):
+        - Add an @autoreleasepool block around a line of code
+          that generates autoreleased objects.  These objects
+          would never be released for the life of the process
+          prior to this change.
+        * WebKitTestRunner/mac/main.mm:
+        (main):
+        - Move instantiation of WTR::TestController outside of
+          @autoreleasepool block so the pool can be drained
+          while running tests.  Prior to this change, this
+          autoreleasePool would never be drained.
+
 2020-01-08  Saam Barati  <sbarati@apple.com>
 

trunk/Tools/WebKitTestRunner/ios/mainIOS.mm

@@ -67 +67 @@
     _argv = argv;
 
-    [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"WebKitLinkedOnOrAfterEverything"];
+    @autoreleasepool {
+        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"WebKitLinkedOnOrAfterEverything"];
+    }
 
     UIApplicationMain(argc, (char**)argv, @"WebKitTestRunnerApp", @"WebKitTestRunnerApp");

trunk/Tools/WebKitTestRunner/mac/main.mm

@@ -65 +65 @@
         setDefaultsToConsistentValuesForTesting();
         disableAppNapInUIProcess(); // For secondary processes, app nap is disabled using WKPreferencesSetPageVisibilityBasedProcessSuppressionEnabled().
-        WTR::TestController controller(argc, argv);
     }
+    WTR::TestController controller(argc, argv);
     return 0;
 }