corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 75b28187fa5e (bug 1361900)

Browse Source
This commit is contained in:
Sebastian Hengst
2017-05-13 18:53:10 +02:00
parent f749a91a17
commit 47a0097791
5 changed files with 117 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
js/xpconnect/loader/ScriptPreloader.cpp
View File

@@ -12,7 +12,6 @@
#include "mozilla/ClearOnShutdown.h"
#include "mozilla/FileUtils.h"
#include "mozilla/Logging.h"
#include "mozilla/ScopeExit.h"
#include "mozilla/Services.h"
#include "mozilla/Unused.h"
#include "mozilla/dom/ContentChild.h"
@@ -56,13 +55,13 @@ ScriptPreloader::CollectReports(nsIHandleReportCallback* aHandleReport,
{
MOZ_COLLECT_REPORT(
"explicit/script-preloader/heap/saved-scripts", KIND_HEAP, UNITS_BYTES,
SizeOfHashEntries<ScriptStatus::Saved>(mScripts, MallocSizeOf),
SizeOfLinkedList(mSavedScripts, MallocSizeOf),
"Memory used to hold the scripts which have been executed in this "
"session, and will be written to the startup script cache file.");
MOZ_COLLECT_REPORT(
"explicit/script-preloader/heap/restored-scripts", KIND_HEAP, UNITS_BYTES,
SizeOfHashEntries<ScriptStatus::Restored>(mScripts, MallocSizeOf),
SizeOfLinkedList(mRestoredScripts, MallocSizeOf),
"Memory used to hold the scripts which have been restored from the "
"startup script cache file, but have not been executed in this session.");
@@ -195,7 +194,11 @@ TraceOp(JSTracer* trc, void* data)
void
ScriptPreloader::Trace(JSTracer* trc)
{
for (auto& script : IterHash(mScripts)) {
for (auto script : mSavedScripts) {
JS::TraceEdge(trc, &script->mScript, "ScriptPreloader::CachedScript.mScript");
}
for (auto script : mRestoredScripts) {
JS::TraceEdge(trc, &script->mScript, "ScriptPreloader::CachedScript.mScript");
}
}
@@ -256,7 +259,8 @@ ScriptPreloader::Cleanup()
}
}
mScripts.Clear();
mSavedScripts.clear();
mRestoredScripts.clear();
AutoSafeJSAPI jsapi;
JS_RemoveExtraGCRootsTracer(jsapi.cx(), TraceOp, this);
@@ -265,19 +269,30 @@ ScriptPreloader::Cleanup()
}
void
ScriptPreloader::FlushCache()
ScriptPreloader::FlushScripts(LinkedList<CachedScript>& scripts)
{
MonitorAutoLock mal(mMonitor);
for (auto next = scripts.getFirst(); next; ) {
auto script = next;
next = script->getNext();
for (auto& script : IterHash(mScripts)) {
// We can only purge finished scripts here. Async scripts that are
// still being parsed off-thread have a non-refcounted reference to
// this script, which needs to stay alive until they finish parsing.
if (script->mReadyToExecute) {
script->Cancel();
script.Remove();
script->remove();
delete script;
}
}
}
void
ScriptPreloader::FlushCache()
{
MonitorAutoLock mal(mMonitor);
FlushScripts(mSavedScripts);
FlushScripts(mRestoredScripts);
// If we've already finished saving the cache at this point, start a new
// delayed save operation. This will write out an empty cache file in place
@@ -315,7 +330,7 @@ ScriptPreloader::Observe(nsISupports* subject, const char* topic, const char16_t
mStartupFinished = true;
if (mChildActor) {
mChildActor->SendScriptsAndFinalize(mScripts);
mChildActor->Finalize(mSavedScripts);
}
} else if (!strcmp(topic, SHUTDOWN_TOPIC)) {
ForceWriteCacheFile();
@@ -434,9 +449,7 @@ ScriptPreloader::InitCacheInternal()
}
{
auto cleanup = MakeScopeExit([&] () {
mScripts.Clear();
});
AutoCleanLinkedList<CachedScript> scripts;
Range<uint8_t> header(data, data + headerSize);
data += headerSize;
@@ -461,14 +474,17 @@ ScriptPreloader::InitCacheInternal()
script->mXDRRange.emplace(scriptData, scriptData + script->mSize);
mScripts.Put(script->mCachePath, script.release());
scripts.insertBack(script.release());
}
if (buf.error()) {
return Err(NS_ERROR_UNEXPECTED);
}
cleanup.release();
for (auto script : scripts) {
mScripts.Put(script->mCachePath, script);
}
mRestoredScripts = Move(scripts);
}
AutoJSAPI jsapi;
@@ -479,8 +495,7 @@ ScriptPreloader::InitCacheInternal()
LOG(Info, "Off-thread decoding scripts...\n");
JS::CompileOptions options(cx, JSVERSION_LATEST);
for (auto& script : IterHash(mScripts, Match<ScriptStatus::Restored>())) {
for (auto script : mRestoredScripts) {
// Only async decode scripts which have been used in this process type.
if (script->mProcessTypes.contains(CurrentProcessType()) &&
script->AsyncDecodable() &&
@@ -521,25 +536,35 @@ ScriptPreloader::PrepareCacheWrite()
return;
}
bool found = Find(IterHash(mScripts), [] (CachedScript* script) {
return (script->mStatus == ScriptStatus::Restored ||
!script->HasRange() || script->HasArray());
});
if (!found) {
mSaveComplete = true;
return;
if (mRestoredScripts.isEmpty()) {
// Check for any new scripts that we need to save. If there aren't
// any, and there aren't any saved scripts that we need to remove,
// don't bother writing out a new cache file.
bool found = false;
for (auto script : mSavedScripts) {
if (!script->HasRange() || script->HasArray()) {
found = true;
break;
}
}
if (!found) {
mSaveComplete = true;
return;
}
}
AutoSafeJSAPI jsapi;
for (auto& script : IterHash(mScripts, Match<ScriptStatus::Saved>())) {
for (CachedScript* next = mSavedScripts.getFirst(); next; ) {
CachedScript* script = next;
next = script->getNext();
// Don't write any scripts that are also in the child cache. They'll be
// loaded from the child cache in that case, so there's no need to write
// them twice.
CachedScript* childScript = mChildCache ? mChildCache->mScripts.Get(script->mCachePath) : nullptr;
if (childScript) {
if (childScript->mStatus == ScriptStatus::Saved) {
if (FindScript(mChildCache->mSavedScripts, script->mCachePath)) {
childScript->UpdateLoadTime(script->mLoadTime);
childScript->mProcessTypes += script->mProcessTypes;
} else {
@@ -548,7 +573,8 @@ ScriptPreloader::PrepareCacheWrite()
}
if (childScript || (!script->mSize && !script->XDREncode(jsapi.cx()))) {
script.Remove();
script->remove();
delete script;
} else {
script->mSize = script->Range().length();
}
@@ -603,7 +629,7 @@ ScriptPreloader::WriteCache()
NS_TRY(cacheFile->OpenNSPRFileDesc(PR_WRONLY | PR_CREATE_FILE, 0644, &fd.rwget()));
nsTArray<CachedScript*> scripts;
for (auto& script : IterHash(mScripts, Match<ScriptStatus::Saved>())) {
for (auto script : mSavedScripts) {
scripts.AppendElement(script);
}
@@ -664,6 +690,17 @@ ScriptPreloader::Run()
return NS_OK;
}
/* static */ ScriptPreloader::CachedScript*
ScriptPreloader::FindScript(LinkedList<CachedScript>& scripts, const nsCString& cachePath)
{
for (auto script : scripts) {
if (script->mCachePath == cachePath) {
return script;
}
}
return nullptr;
}
void
ScriptPreloader::NoteScript(const nsCString& url, const nsCString& cachePath,
JS::HandleScript jsscript)
@@ -680,14 +717,22 @@ ScriptPreloader::NoteScript(const nsCString& url, const nsCString& cachePath,
return;
}
auto script = mScripts.LookupOrAdd(cachePath, *this, url, cachePath, jsscript);
CachedScript* script = mScripts.Get(cachePath);
bool restored = script && FindScript(mRestoredScripts, cachePath);
if (script->mStatus == ScriptStatus::Restored) {
script->mStatus = ScriptStatus::Saved;
if (restored) {
script->remove();
mSavedScripts.insertBack(script);
MOZ_ASSERT(jsscript);
script->mScript = jsscript;
script->mReadyToExecute = true;
} else if (!script) {
script = new CachedScript(*this, url, cachePath, jsscript);
mSavedScripts.insertBack(script);
mScripts.Put(cachePath, script);
} else {
return;
}
script->UpdateLoadTime(TimeStamp::Now());
@@ -699,13 +744,21 @@ ScriptPreloader::NoteScript(const nsCString& url, const nsCString& cachePath,
ProcessType processType, nsTArray<uint8_t>&& xdrData,
TimeStamp loadTime)
{
auto script = mScripts.LookupOrAdd(cachePath, *this, url, cachePath, nullptr);
CachedScript* script = mScripts.Get(cachePath);
bool restored = script && FindScript(mRestoredScripts, cachePath);
if (script->mStatus == ScriptStatus::Restored) {
script->mStatus = ScriptStatus::Saved;
if (restored) {
script->remove();
mSavedScripts.insertBack(script);
script->mReadyToExecute = true;
} else {
if (!script) {
script = new CachedScript(this, url, cachePath, nullptr);
mSavedScripts.insertBack(script);
mScripts.Put(cachePath, script);
}
if (!script->HasRange()) {
MOZ_ASSERT(!script->HasArray());
@@ -816,7 +869,6 @@ ScriptPreloader::OffThreadDecodeCallback(void* token, void* context)
ScriptPreloader::CachedScript::CachedScript(ScriptPreloader& cache, InputBuffer& buf)
: mCache(cache)
, mStatus(ScriptStatus::Restored)
{
Code(buf);
}