Modified: trunk/Source/_javascript_Core/jsc.cpp (241611 => 241612)
--- trunk/Source/_javascript_Core/jsc.cpp 2019-02-15 21:25:28 UTC (rev 241611)
+++ trunk/Source/_javascript_Core/jsc.cpp 2019-02-15 21:27:54 UTC (rev 241612)
@@ -954,12 +954,110 @@
return true;
}
+class ShellSourceProvider : public StringSourceProvider {
+public:
+ static Ref<ShellSourceProvider> create(const String& source, const SourceOrigin& sourceOrigin, URL&& url, const TextPosition& startPosition, SourceProviderSourceType sourceType)
+ {
+ return adoptRef(*new ShellSourceProvider(source, sourceOrigin, WTFMove(url), startPosition, sourceType));
+ }
+
+ ~ShellSourceProvider()
+ {
+#if OS(DARWIN)
+ if (m_cachedBytecode.size())
+ munmap(const_cast<void*>(m_cachedBytecode.data()), m_cachedBytecode.size());
+#endif
+ }
+
+ const CachedBytecode* cachedBytecode() const override
+ {
+ return &m_cachedBytecode;
+ }
+
+ bool cacheBytecode(const CachedBytecode& cachedBytecode) const override
+ {
+#if OS(DARWIN)
+ String filename = cachePath();
+ if (filename.isNull())
+ return false;
+ int fd = open(filename.utf8().data(), O_CREAT | O_WRONLY, 0666);
+ if (fd == -1)
+ return false;
+ int rc = flock(fd, LOCK_EX | LOCK_NB);
+ if (!rc)
+ write(fd, cachedBytecode.data(), cachedBytecode.size());
+ close(fd);
+ return !rc;
+#else
+ return false;
+#endif
+ }
+
+private:
+ String cachePath() const
+ {
+ const char* cachePath = Options::diskCachePath();
+ if (!cachePath)
+ return String(static_cast<const char*>(nullptr));
+
+ String filename = sourceOrigin().string();
+ filename.replace('/', '_');
+ return makeString(cachePath, '/', source().toString().hash(), '-', filename, ".bytecode-cache");
+ }
+
+ void loadBytecode()
+ {
+#if OS(DARWIN)
+ String filename = cachePath();
+ if (filename.isNull())
+ return;
+
+ int fd = open(filename.utf8().data(), O_RDONLY);
+ if (fd == -1)
+ return;
+
+ int rc = flock(fd, LOCK_SH | LOCK_NB);
+ if (rc) {
+ close(fd);
+ return;
+ }
+
+ struct stat sb;
+ int res = fstat(fd, &sb);
+ size_t size = static_cast<size_t>(sb.st_size);
+ if (res || !size) {
+ close(fd);
+ return;
+ }
+
+ void* buffer = mmap(nullptr, size, PROT_READ, MAP_PRIVATE, fd, 0);
+ close(fd);
+ if (buffer == MAP_FAILED)
+ return;
+ m_cachedBytecode = CachedBytecode { buffer, size };
+#endif
+ }
+
+ ShellSourceProvider(const String& source, const SourceOrigin& sourceOrigin, URL&& url, const TextPosition& startPosition, SourceProviderSourceType sourceType)
+ : StringSourceProvider(source, sourceOrigin, WTFMove(url), startPosition, sourceType)
+ {
+ loadBytecode();
+ }
+
+ CachedBytecode m_cachedBytecode;
+};
+
+static inline SourceCode jscSource(const String& source, const SourceOrigin& sourceOrigin, URL&& url = "" const TextPosition& startPosition = TextPosition(), SourceProviderSourceType sourceType = SourceProviderSourceType::Program)
+{
+ return SourceCode(ShellSourceProvider::create(source, sourceOrigin, WTFMove(url), startPosition, sourceType), startPosition.m_line.oneBasedInt(), startPosition.m_column.oneBasedInt());
+}
+
template<typename Vector>
static inline SourceCode jscSource(const Vector& utf8, const SourceOrigin& sourceOrigin, const String& filename)
{
// FIXME: This should use an absolute file URL https://bugs.webkit.org/show_bug.cgi?id=193077
String str = stringFromUTF(utf8);
- return makeSource(str, sourceOrigin, URL({ }, filename));
+ return jscSource(str, sourceOrigin, URL({ }, filename));
}
template<typename Vector>
@@ -1042,7 +1140,7 @@
}
#endif
- auto sourceCode = JSSourceCode::create(vm, makeSource(stringFromUTF(buffer), SourceOrigin { moduleKey }, WTFMove(moduleURL), TextPosition(), SourceProviderSourceType::Module));
+ auto sourceCode = JSSourceCode::create(vm, jscSource(stringFromUTF(buffer), SourceOrigin { moduleKey }, WTFMove(moduleURL), TextPosition(), SourceProviderSourceType::Module));
catchScope.releaseAssertNoException();
auto result = deferred->resolve(exec, sourceCode);
catchScope.clearException();
@@ -1715,7 +1813,7 @@
return JSValue::encode(throwException(exec, scope, createError(exec, "Expected global to point to a global object"_s)));
NakedPtr<Exception> evaluationException;
- JSValue result = evaluate(globalObject->globalExec(), makeSource(sourceCode, exec->callerSourceOrigin()), JSValue(), evaluationException);
+ JSValue result = evaluate(globalObject->globalExec(), jscSource(sourceCode, exec->callerSourceOrigin()), JSValue(), evaluationException);
if (evaluationException)
throwException(exec, scope, evaluationException);
return JSValue::encode(result);
@@ -2471,7 +2569,7 @@
if (isModule) {
if (!promise) {
// FIXME: This should use an absolute file URL https://bugs.webkit.org/show_bug.cgi?id=193077
- promise = loadAndEvaluateModule(globalObject->globalExec(), makeSource(stringFromUTF(scriptBuffer), SourceOrigin { absolutePath(fileName) }, URL({ }, fileName), TextPosition(), SourceProviderSourceType::Module), jsUndefined());
+ promise = loadAndEvaluateModule(globalObject->globalExec(), jscSource(stringFromUTF(scriptBuffer), SourceOrigin { absolutePath(fileName) }, URL({ }, fileName), TextPosition(), SourceProviderSourceType::Module), jsUndefined());
}
scope.clearException();
Modified: trunk/Source/_javascript_Core/runtime/CodeCache.cpp (241611 => 241612)
--- trunk/Source/_javascript_Core/runtime/CodeCache.cpp 2019-02-15 21:25:28 UTC (rev 241611)
+++ trunk/Source/_javascript_Core/runtime/CodeCache.cpp 2019-02-15 21:27:54 UTC (rev 241612)
@@ -189,30 +189,13 @@
void writeCodeBlock(VM& vm, const SourceCodeKey& key, const SourceCodeValue& value)
{
-#if OS(DARWIN)
- const char* cachePath = Options::diskCachePath();
- if (LIKELY(!cachePath))
- return;
-
UnlinkedCodeBlock* codeBlock = jsDynamicCast<UnlinkedCodeBlock*>(vm, value.cell.get());
if (!codeBlock)
return;
std::pair<MallocPtr<uint8_t>, size_t> result = encodeCodeBlock(vm, key, codeBlock);
-
- String filename = makeString(cachePath, '/', key.hash(), ".cache");
- int fd = open(filename.utf8().data(), O_CREAT | O_WRONLY, 0666);
- if (fd == -1)
- return;
- int rc = flock(fd, LOCK_EX | LOCK_NB);
- if (!rc)
- ::write(fd, result.first.get(), result.second);
- close(fd);
-#else
- UNUSED_PARAM(vm);
- UNUSED_PARAM(key);
- UNUSED_PARAM(value);
-#endif
+ CachedBytecode cachedBytecode { WTFMove(result.first), result.second };
+ key.source().provider().cacheBytecode(cachedBytecode);
}
CachedBytecode serializeBytecode(VM& vm, UnlinkedCodeBlock* codeBlock, const SourceCode& source, SourceCodeType codeType, JSParserStrictMode strictMode, JSParserScriptMode scriptMode, DebuggerMode debuggerMode)
Modified: trunk/Source/_javascript_Core/runtime/CodeCache.h (241611 => 241612)
--- trunk/Source/_javascript_Core/runtime/CodeCache.h 2019-02-15 21:25:28 UTC (rev 241611)
+++ trunk/Source/_javascript_Core/runtime/CodeCache.h 2019-02-15 21:27:54 UTC (rev 241612)
@@ -109,60 +109,14 @@
template<typename UnlinkedCodeBlockType>
UnlinkedCodeBlockType* fetchFromDiskImpl(VM& vm, const SourceCodeKey& key)
{
- {
- const auto* cachedBytecode = key.source().provider().cachedBytecode();
- if (cachedBytecode && cachedBytecode->size()) {
- VERBOSE_LOG("Found cached CodeBlock in the SourceProvider");
- UnlinkedCodeBlockType* unlinkedCodeBlock = decodeCodeBlock<UnlinkedCodeBlockType>(vm, key, cachedBytecode->data(), cachedBytecode->size());
- if (unlinkedCodeBlock)
- return unlinkedCodeBlock;
- }
+ const auto* cachedBytecode = key.source().provider().cachedBytecode();
+ if (cachedBytecode && cachedBytecode->size()) {
+ VERBOSE_LOG("Found cached CodeBlock in the SourceProvider");
+ UnlinkedCodeBlockType* unlinkedCodeBlock = decodeCodeBlock<UnlinkedCodeBlockType>(vm, key, cachedBytecode->data(), cachedBytecode->size());
+ if (unlinkedCodeBlock)
+ return unlinkedCodeBlock;
}
-
-#if OS(DARWIN)
- const char* cachePath = Options::diskCachePath();
- if (!cachePath)
- return nullptr;
-
- unsigned hash = key.hash();
- char filename[512];
- int count = snprintf(filename, 512, "%s/%u.cache", cachePath, hash);
- if (count < 0 || count > 512)
- return nullptr;
-
- int fd = open(filename, O_RDONLY);
- if (fd == -1)
- return nullptr;
-
- int rc = flock(fd, LOCK_SH | LOCK_NB);
- if (rc) {
- close(fd);
- return nullptr;
- }
-
- struct stat sb;
- int res = fstat(fd, &sb);
- size_t size = static_cast<size_t>(sb.st_size);
- if (res || !size) {
- close(fd);
- return nullptr;
- }
-
- void* buffer = mmap(nullptr, size, PROT_READ, MAP_PRIVATE, fd, 0);
- UnlinkedCodeBlockType* unlinkedCodeBlock = decodeCodeBlock<UnlinkedCodeBlockType>(vm, key, buffer, size);
- munmap(buffer, size);
-
- if (!unlinkedCodeBlock)
- return nullptr;
-
- VERBOSE_LOG("Found cached CodeBlock on disk");
- addCache(key, SourceCodeValue(vm, unlinkedCodeBlock, m_age, true));
- return unlinkedCodeBlock;
-#else
- UNUSED_PARAM(vm);
- UNUSED_PARAM(key);
return nullptr;
-#endif
}
template<typename UnlinkedCodeBlockType>
