Changeset 290900 in webkit

Timestamp:

Mar 7, 2022, 11:27:00 AM (3 years ago)

Author:

commit-queue@webkit.org

Message:

LayoutTests/webgl/max-active-contexts-gc.html is flaky
​https://bugs.webkit.org/show_bug.cgi?id=237466

Patch by Kimmo Kinnunen <​kkinnunen@apple.com> on 2022-03-07
Reviewed by Alexey Proskuryakov.
The test:

• created 16 WebGL contexts
• unreferenced 8 WebGL contexts.
• forced gc
• added 9 WebGL contexts.

The test tries to test that GC removes unreferenced contexts.
To assert this, it ends up with 17 contexts, which is 1 above
the maximum active limit. This means one context is lost and the
implementation prints one line of error.

Since the GC is not exact, sometimes it would only collect 7 of the 8
unreferenced contexts. This would mean two error messages.

Fix by trying to collect each time a context is unreferenced. This seems to be
more predictable.

• webgl/max-active-contexts-gc.html:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• webgl/max-active-contexts-gc.html (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-03-07  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+        LayoutTests/webgl/max-active-contexts-gc.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=237466
+
+        Reviewed by Alexey Proskuryakov.
+        The test:
+         - created 16 WebGL contexts
+         - unreferenced 8 WebGL contexts.
+         - forced gc
+         - added 9 WebGL contexts.
+        The test tries to test that GC removes unreferenced contexts.
+        To assert this, it ends up with 17 contexts, which is 1 above
+        the maximum active limit. This means one context is lost and the
+        implementation prints one line of error.
+
+        Since the GC is not exact, sometimes it would only collect 7 of the 8
+        unreferenced contexts. This would mean two error messages.
+
+        Fix by trying to collect each time a context is unreferenced. This seems to be
+        more predictable.
+
+        * webgl/max-active-contexts-gc.html:
+
 2022-03-07  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/webgl/max-active-contexts-gc.html

@@ -1 +1 @@
 <script>
-function forceGC() {
+function collect() {
+    if (window.GCController) {
+        GCController.collect();
+        return;
+    }
     try {
         for (var ndx = 0; ndx < 99000; ndx++)
@@ -25 +29 @@
 
 // Now remove some of those contexts from this array so they may be garbage collected.
-while (contexts.length > contextsToKeep)
+while (contexts.length > contextsToKeep) {
     contexts.shift();
+    collect();
+}
 
+// Add contexts until we get to the limit then add one more. This should only
+// produce a single warning that an older context will be lost.
 setTimeout(function() {
-    if (window.GCController)
-        GCController.collect();
-    else
-        forceGC();
-
-    // Add contexts until we get to the limit then add one more. This should only
-    // produce a single warning that an older context will be lost.
-    setTimeout(function() {
-        while (contexts.length < maxNumberOfActiveContexts + 1)
-            addContext();
-
-        if (window.testRunner)
-            testRunner.notifyDone();
-    });
+    while (contexts.length < maxNumberOfActiveContexts + 1)
+        addContext();
+    if (window.testRunner)
+        testRunner.notifyDone();
 });