Changeset 267583 in webkit

Timestamp:

Sep 25, 2020, 11:20:57 AM (6 years ago)

Author:

Alan Coon

Message:

Cherry-pick r266765. rdar://problem/69382910

[ macOS iOS ] svg/animations/smil-leak-element-instances-noBaseValRef.svg is a flaky failure
​https://bugs.webkit.org/show_bug.cgi?id=215353

Patch by Said Abou-Hallawa <​sabouhallawa@apple.com> on 2020-09-08
Reviewed by Geoffrey Garen.

This patch reverts r265780 and goes in the opposite direction: allocating
lots and lots of objects, then proving that the number of live objects
did not grow a lot.

GCController can be conservative sometimes and leaves some objects here
and there. So we should not be checking that *all* the objects were freed
to verify there was no leak in allocating the SVG properties objects.

Instead we can check for an end-to-end test the memory did not grow a lot
despite the huge number of allocations.

• svg/animations/smil-leak-element-instances-noBaseValRef.svg:

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@266765 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-610-branch/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• svg/animations/smil-leak-element-instances-noBaseValRef.svg (modified) (2 diffs)

branches/safari-610-branch/LayoutTests/ChangeLog

@@ +1 @@
+2020-09-22  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r266765. rdar://problem/69382910
+
+    [ macOS iOS ] svg/animations/smil-leak-element-instances-noBaseValRef.svg is a flaky failure
+    https://bugs.webkit.org/show_bug.cgi?id=215353
+    
+    Patch by Said Abou-Hallawa <sabouhallawa@apple.com> on 2020-09-08
+    Reviewed by Geoffrey Garen.
+    
+    This patch reverts r265780 and goes in the opposite direction: allocating
+    lots and lots of objects, then proving that the number of live objects
+    did not grow a lot.
+    
+    GCController can be conservative sometimes and leaves some objects here
+    and there. So we should not be checking that *all* the objects were freed
+    to verify there was no leak in allocating the SVG properties objects.
+    
+    Instead we can check for an end-to-end test the memory did not grow a lot
+    despite the huge number of allocations.
+    
+    * svg/animations/smil-leak-element-instances-noBaseValRef.svg:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266765 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-09-08  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+            [ macOS iOS ] svg/animations/smil-leak-element-instances-noBaseValRef.svg is a flaky failure
+            https://bugs.webkit.org/show_bug.cgi?id=215353
+
+            Reviewed by Geoffrey Garen.
+
+            This patch reverts r265780 and goes in the opposite direction: allocating
+            lots and lots of objects, then proving that the number of live objects
+            did not grow a lot.
+
+            GCController can be conservative sometimes and leaves some objects here
+            and there. So we should not be checking that *all* the objects were freed
+            to verify there was no leak in allocating the SVG properties objects.
+
+            Instead we can check for an end-to-end test the memory did not grow a lot
+            despite the huge number of allocations.
+
+            * svg/animations/smil-leak-element-instances-noBaseValRef.svg:
+
 2020-09-23  Karl Rackler  <rackler@apple.com>
 

branches/safari-610-branch/LayoutTests/svg/animations/smil-leak-element-instances-noBaseValRef.svg

@@ -33 +33 @@
 }
 
-function startTest() {
+function runTest() {
     // Collect garbage before recording starting live node count, in case there are live elements from previous tests.
     GCController.collect();
-    originalLiveElements = window.internals.numberOfLiveNodes();
+    var originalLiveElements = window.internals.numberOfLiveNodes();
 
-    for (var i = 0; i < 3; i++)
+    for (var i = 0; i < 1000; i++)
         g.appendChild(createAnimatedRectInstance());
 
-    setTimeout(continueTest, 0);
-}
-
-function continueTest() {
     while (g.hasChildNodes())
         g.removeChild(g.lastChild);
 
-    setTimeout(finishTest, 0);
-}
+    GCController.collect();
+    var liveDelta = window.internals.numberOfLiveNodes() - originalLiveElements;
 
-var attemptsToFinish = 5;
-
-function finishTest() {
-    GCController.collect();
-
-    var liveDelta = window.internals.numberOfLiveNodes() - originalLiveElements;
-    if (liveDelta == 0)
+    // The goal of this test is to verify allocating lots and lots of objects will not
+    // grow the allocated memory a lot once they are removed.
+    if (liveDelta <= 5)
         log("PASS");
-    else if (--attemptsToFinish) {
-        setTimeout(finishTest, 100);
-        return;
-    } else
+    else
         log("FAIL: " + liveDelta + " extra live node(s)");
 
@@ -77 +66 @@
     }
 
-    setTimeout(startTest, 0);
+    setTimeout(runTest, 0);
 }
 ]]>