Changeset 214805 in webkit

Timestamp:

Apr 3, 2017 9:54:49 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r214509 - The Mutator should not be able to steal the conn if the Collector hasn't reached the NotRunning phase yet.
​https://bugs.webkit.org/show_bug.cgi?id=170213
<rdar://problem/30755345>

Reviewed by Filip Pizlo.

The current condition for stealing the conn isn't tight enough. Restricting the
stealing to when m_currentPhase == NotRunning ensures that the Collector is
really done running.

No test because this issue only manifests with a race condition that is difficult
to reproduce on demand.

• heap/Heap.cpp:

(JSC::Heap::requestCollection):

Location:

releases/WebKitGTK/webkit-2.16/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• heap/Heap.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.16/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-03-28  Mark Lam  <mark.lam@apple.com>
+
+        The Mutator should not be able to steal the conn if the Collector hasn't reached the NotRunning phase yet.
+        https://bugs.webkit.org/show_bug.cgi?id=170213
+        <rdar://problem/30755345>
+
+        Reviewed by Filip Pizlo.
+
+        The current condition for stealing the conn isn't tight enough.  Restricting the
+        stealing to when m_currentPhase == NotRunning ensures that the Collector is
+        really done running.
+
+        No test because this issue only manifests with a race condition that is difficult
+        to reproduce on demand.
+
+        * heap/Heap.cpp:
+        (JSC::Heap::requestCollection):
+
 2017-03-24  Mark Lam  <mark.lam@apple.com>
 

releases/WebKitGTK/webkit-2.16/Source/JavaScriptCore/heap/Heap.cpp

@@ -1937 +1937 @@
     // cases.
     ASSERT(m_lastServedTicket <= m_lastGrantedTicket);
-    if (m_lastServedTicket == m_lastGrantedTicket) {
+    if ((m_lastServedTicket == m_lastGrantedTicket) && (m_currentPhase == CollectorPhase::NotRunning)) {
         if (false)
             dataLog("Taking the conn.\n");