Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1363482: Part 10 - Preload addonStartup.json off-thread during startup. r=rhelmer

Browse Source 
MozReview-Commit-ID: 4jYpr9kXKq9

--HG--
extra : rebase_source : c7f2ac683f83664b017842752554e7653d02cf10
This commit is contained in:
Kris Maglione 2017-05-12 14:58:02 -07:00
parent c55f80844a
commit ed962213bd
1 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
toolkit/mozapps/extensions/AddonManagerStartup.cpp
View File

@ -19,6 +19,7 @@
#include "mozilla/ResultExtensions.h"
#include "mozilla/ScopeExit.h"
#include "mozilla/Services.h"
#include "mozilla/URLPreloader.h"
#include "mozilla/Unused.h"
#include "mozilla/ErrorResult.h"
#include "mozilla/dom/ipc/StructuredCloneData.h"
@ -104,28 +105,6 @@ IsNormalFile(nsIFile* file)
return NS_SUCCEEDED(file->IsFile(&result)) && result;
}
static Result<nsCString, nsresult>
ReadFile(nsIFile* file)
{
nsCString result;
AutoFDClose fd;
MOZ_TRY(file->OpenNSPRFileDesc(PR_RDONLY, 0, &fd.rwget()));
auto size = PR_Seek64(fd, 0, PR_SEEK_END);
PR_Seek64(fd, 0, PR_SEEK_SET);
result.SetLength(size);
auto len = PR_Read(fd, result.BeginWriting(), size);
if (size != len) {
return Err(NS_ERROR_FAILURE);
}
return result;
}
static const char STRUCTURED_CLONE_MAGIC[] = "mozJSSCLz40v001";
template <typename T>
@ -189,19 +168,14 @@ static_assert(sizeof STRUCTURED_CLONE_MAGIC % 8 == 0,
/**
* Reads the contents of a LZ4-compressed file, as stored by the OS.File
* module, and returns the decompressed contents on success.
*
* A nonexistent or empty file is treated as success. A corrupt or non-LZ4
* file is treated as failure.
*/
static Result<nsCString, nsresult>
ReadFileLZ4(nsIFile* file)
{
static const char MAGIC_NUMBER[] = "mozLz40";
nsCString result;
nsCString lz4;
MOZ_TRY_VAR(lz4, ReadFile(file));
MOZ_TRY_VAR(lz4, URLPreloader::ReadFile(file));
if (lz4.IsEmpty()) {
return lz4;
@ -586,7 +560,12 @@ AddonManagerStartup::ReadStartupData(JSContext* cx, JS::MutableHandleValue locat
nsCOMPtr<nsIFile> file = CloneAndAppend(ProfileDir(), "addonStartup.json.lz4");
nsCString data;
MOZ_TRY_VAR(data, ReadFileLZ4(file));
auto res = ReadFileLZ4(file);
if (res.isOk()) {
data = res.unwrap();
} else if (res.unwrapErr() != NS_ERROR_FILE_NOT_FOUND) {
return res.unwrapErr();
}
if (data.IsEmpty() || !ParseJSON(cx, data, locations)) {
return NS_OK;