Changeset 192401 in webkit

Timestamp:

Nov 12, 2015 6:53:52 PM (8 years ago)

Author:

ggaren@apple.com

Message:

Restore CodeBlock jettison code I accidentally removed
​https://bugs.webkit.org/show_bug.cgi?id=151241

Reviewed by Andreas Kling.

I meant to add this back in <​http://trac.webkit.org/changeset/190827>
but I missed.

• bytecode/CodeBlock.cpp:

(JSC::timeToLive):
(JSC::CodeBlock::shouldJettisonDueToOldAge):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/CodeBlock.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-11-12  Geoffrey Garen  <ggaren@apple.com>
+
+        Restore CodeBlock jettison code I accidentally removed
+        https://bugs.webkit.org/show_bug.cgi?id=151241
+
+        Reviewed by Andreas Kling.
+
+        I meant to add this back in <http://trac.webkit.org/changeset/190827>
+        but I missed.
+
+        * bytecode/CodeBlock.cpp:
+        (JSC::timeToLive):
+        (JSC::CodeBlock::shouldJettisonDueToOldAge):
+
 2015-11-12  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -81 +81 @@
 
 namespace JSC {
+
+static std::chrono::milliseconds timeToLive(JITCode::JITType jitType)
+{
+    switch (jitType) {
+    case JITCode::InterpreterThunk:
+        return std::chrono::duration_cast<std::chrono::milliseconds>(
+            std::chrono::seconds(5));
+    case JITCode::BaselineJIT:
+        // Effectively 10 additional seconds, since BaselineJIT and
+        // InterpreterThunk share a CodeBlock.
+        return std::chrono::duration_cast<std::chrono::milliseconds>(
+            std::chrono::seconds(15));
+    case JITCode::DFGJIT:
+        return std::chrono::duration_cast<std::chrono::milliseconds>(
+            std::chrono::seconds(20));
+    case JITCode::FTLJIT:
+        return std::chrono::duration_cast<std::chrono::milliseconds>(
+            std::chrono::seconds(60));
+    default:
+        return std::chrono::milliseconds::max();
+    }
+}
 
 const ClassInfo CodeBlock::s_info = {
@@ -2418 +2440 @@
 bool CodeBlock::shouldJettisonDueToOldAge()
 {
-    return false;
+    if (Heap::isMarked(this))
+        return false;
+
+    if (timeSinceCreation() < timeToLive(jitType()))
+        return false;
+
+    return true;
 }