Changeset 241442 in webkit

Timestamp:

Feb 13, 2019, 10:50:20 AM (6 years ago)

Author:

Tadeu Zagallo

Message:

CodeBlocks read from disk should not be re-written
​https://bugs.webkit.org/show_bug.cgi?id=194535

Reviewed by Michael Saboff.

Keep track of which CodeBlocks have been read from disk or have already
been serialized in CodeCache.

• runtime/CodeCache.cpp:

(JSC::CodeCache::write):

• runtime/CodeCache.h:

(JSC::SourceCodeValue::SourceCodeValue):
(JSC::CodeCacheMap::fetchFromDiskImpl):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/CodeCache.cpp (modified) (1 diff)
• runtime/CodeCache.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog ¶

@@ +1 @@
+2019-02-13  Tadeu Zagallo  <tzagallo@apple.com>
+
+        CodeBlocks read from disk should not be re-written
+        https://bugs.webkit.org/show_bug.cgi?id=194535
+
+        Reviewed by Michael Saboff.
+
+        Keep track of which CodeBlocks have been read from disk or have already
+        been serialized in CodeCache.
+
+        * runtime/CodeCache.cpp:
+        (JSC::CodeCache::write):
+        * runtime/CodeCache.h:
+        (JSC::SourceCodeValue::SourceCodeValue):
+        (JSC::CodeCacheMap::fetchFromDiskImpl):
+
 2019-02-13  Tadeu Zagallo  <tzagallo@apple.com>
 

trunk/Source/JavaScriptCore/runtime/CodeCache.cpp ¶

@@ -160 +160 @@
 void CodeCache::write(VM& vm)
 {
-    for (const auto& it : m_sourceCode)
+    for (auto& it : m_sourceCode) {
+        if (it.value.written)
+            continue;
+        it.value.written = true;
         writeCodeBlock(vm, it.key, it.value);
+    }
 }
 

trunk/Source/JavaScriptCore/runtime/CodeCache.h ¶

@@ -76 +76 @@
     }
 
-    SourceCodeValue(VM& vm, JSCell* cell, int64_t age)
+    SourceCodeValue(VM& vm, JSCell* cell, int64_t age, bool written = false)
         : cell(vm, cell)
         , age(age)
+        , written(written)
     {
     }
@@ -84 +85 @@
     Strong<JSCell> cell;
     int64_t age;
+    bool written;
 };
 
@@ -155 +157 @@
 
         VERBOSE_LOG("Found cached CodeBlock on disk");
-        addCache(key, SourceCodeValue(vm, unlinkedCodeBlock, m_age));
+        addCache(key, SourceCodeValue(vm, unlinkedCodeBlock, m_age, true));
         return unlinkedCodeBlock;
 #else