mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
b808ffac2d
- Bug 1196391, part 3 - Make argument count assertions fatal in js::ExpandErrorArgumentsVA(). r=Waldo (8233c0afac) - minor cleanup (1da0b2c3e9) - Bug 1191765: Make Debugger.Object.prototype.getScript properly recognize functions without scripts. r=fitzgen (3e2753577f) - Bug 1165807 - display WeakSet and WeakMap contents in console; r=bz,fitzgen (d8f70d8e6a) - Bug 1226024 - Expose the root of the dominator tree to JavaScript; r=bz,sfink x # Please enter the commit message for your changes. Lines starting (1949832288) - Bug 1220702 - Part 1: Replace callback() and newNode() with variadic templates. What could go wrong? r=Waldo. (80e1b40871) - Bug 1220702 - Part 2: Fix the .method property of certain FunctionDeclaration nodes. r=Waldo. (47f244a6e0) - Bug 1220702 - Part 3: Distinguish ES6 generators from legacy generators in Reflect.parse() output. r=Waldo. (362bb8ea4b) - bit of Bug 1180017 - Fix up the badly-horked backout and re-land. (f4f92ff88c) - Bug 1155303 - Add telemetry for async DeferredFinalize max pause. r=smaug (3ddc7b8856) - Bug 1174796 - Make sure ReleaseNow releases everything. r=smaug (5065aa1f52) - Bug 1191918 - Remove printf debugging r=me (48e95e425e) - update some tests (26ae4a8050) - Bug 1218643 - correct a DOM test. r=smaug " (75c6302bbb) - space (26dfeca131) - Bug 1166805 part 1 - refactor common tests for whether an animated list mirrors the base version of the list into methods. r=dholbert (e538b90e00) - Bug 1166805 part 2 - Call SetCapacity before calling DOMSVGXXXList::MaybeInsertNullInAnimValListAt, to prevent fallible InsertElementAt calls from failing r=dholbert (918397681f) - Bug 1092125 - Part 1 - Add non-scaling-stroke support to nsSVGPathGeometryElement::GetGeometryBounds (except line). r=jwatt (19ee6f9517) - Bug 1092125 - part 2 - add non-scaling-stroke support to SVGLineElement::GetGeometryBounds. r=jwatt (2c84b88ff1) - Bug 1140080 - ensure we only create stop frames for gradients. r=dholbert (636db91975) - Bug 1182496 - Don't create frames for SVG <text> descendants with failing conditional processing attributes. r=dholbert (4e976c1587) - Bug 1149542 - Part 3: Crashtest. r=dholbert (cde5ca0f57) - Bug 1209525 - Protect GetGeometryBounds from a singular non-scaling-stroke transform. r=longsonr (2cd1f2e0a4) - Bug 325427 - Add crashtest. (98ab5e6907) - Bug 803562 - force -moz-appearance: none on foreignObject elements. r=dbaron (0ba37f76ad) - Bug 950324 - Add crashtest. (6e2f7bc4c2) - Bug 1178159 - Ignore stroke-linecap:"square" on circle and ellipse. r=longsonr (42f4a9a71c) - Bug 1187770 - work around draw targets that don't display zero-length lines. r=longsonr (a612616ecb) - Bug 1222812 - add a null check in case there is no old style. r=dholbert (6a883edea2) - Bug 958160 - Compute bounds in transformed space instead of user space in GetCoveredRegion. r=longsonr (d020a10c56) - Bug 1224061: Followup to fix b2g bustage r=me CLOSED TREE (1dc2693955) - Bug 1173573 - Fix possible crash initializing sessionstorage. r=honzab (c6c77ccf7d) - Bug 536509 - Update localStorage to use common StorageAllowedForWindow logic, r=ehsan (825ee71ff3) - Bug 606655 - delete cookies UI option AskMeEveryTime and its related comments and tests. r=mak (828dfe54a5) - Bug 1194052 - Append to redirectchain before asyncopen() is called (r=sicking,mayhemer) (bb051ceb94) - Bug 1145503 - TP exceptions added while in Private Browsing mode persist beyond the Private Browsing session. r=ehsan Import url-classifier and private browsing modules. (4492b2de09) - Bug 1138979 - Pref to turn TP on when in Private Browsing mode. r=mmc , r=ehsan (5078eaa914) - Bug 1168635 - Extend nsITLSServerSocket to customize cipher suites. r=keeler (185a551640) - Bug 1165423 - WebRTC Fix DTLS handshake by expanding UDP buffer. r=rjesup (1f207e03ee) - Bug 1219939 - make nsTemporaryFileInputStream nsISeekableStream, r=jduell (f2a5ddfbf2) - Bug 1125816 - Parse FTP directory listings of Windows CE and WEC7 FTP Server r=jduell (4137b29d21) - Bug 1171016 - Initialize the linelen variable at its declaration in ParseFTPList.cpp. r=mcmanus (2a3960897d) - Bug 1197313 - remove PR_snprintf calls in netwerk/; r=froydnj (005da76d31) - Bug 1219910 - make gSocketThread a relaxed atomic variable; r=mcmanus (620d299605) - Bug 1222867 - part 1 - return already_AddRefed from WebSocketEventService::CreateFrameIfNeeded; r=mcmanus (0eee829a08) - Bug 1222867 - part 2 - be smarter about transferring ownership of WebSocketFrame; r=mcmanus (4a9fd71798) - Bug 1211001 - constant ASSERTION: nsITimer->SetDelay() called when the one-shot timer is not set up, r=mcmanus (451c903cbe) - Bug 1130822 - properly decode arbitrarily aligned data for non-tier1 platforms. r=mcmanus (bcb99913dc) - Bug 1204731 - telemetry for peer h2 goaway r=hurley (d6748682b4) - Bug 1205810 - telemetry for local h2 goaway code r=hurley (e142625588) - bug 1194818 - h2 header priority handling r=hurley (51766fff44) - bug 1194820 - h2 push promise padding handling r=hurley (560ee1f480) - bug 1208114 - fix h2 connect tunnels r=hurley (d17f920c31) - Bug 1213060 (part 1) - Properly handle discarding padding in Http2Session::OnWriteSegment. r=mcmanus (2cce4ac006) - Bug 1213060 (part 2) - Re-add state assertion in Http2Session::OnWriteSegment. r=mcmanus (6b1c030780) - fix build (39845819f6) - Bug 1214076 - allow TokenServerClient errors to be JSON.stringify'd. r=rnewman (ab6085fa97) - Bug 1220007 P1 Allow ConsoleReportCollectors to flush to another collector. r=bz (a97b2c5a57) - Bug 1220007 P2 Make InterceptedChannel's collect logs locally and only flush to nsIChannel on main thread r=bz (85b77c5a44) - Bug 867407 - Fix cloning of file URIs with search query strings (r=sworkman) (da6fd51c15) - Bug 1220728 Clear pending exceptions if string conversion fails in SWintercept error handling. r=bz (b188c34862) - Bug 1147913 - Change NS_SOCKETTRANSPORTSERVICE_CONTRACTID to NS_STREAMTRANSPORTSERVICE_CONTRACTID in RespondWithHandler::ResolvedCallback. r=ehsan (5b443e88ab) - fix namespace (562ed51caa) - Bug 1206060 - Show pinning status at about:cache. r=michal (75ed53663f) - Bug 1032254 - Generic way to pin reasource in the HTTP cache, r=michal (eeb860f8e3) - Bug 1211504. Remove unused member from RefLayer. (fab6bae915)
785 lines
19 KiB
C++
785 lines
19 KiB
C++
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "CacheLog.h"
|
|
#include "CacheFileChunk.h"
|
|
|
|
#include "CacheFile.h"
|
|
#include "nsThreadUtils.h"
|
|
|
|
namespace mozilla {
|
|
namespace net {
|
|
|
|
#define kMinBufSize 512
|
|
|
|
class NotifyUpdateListenerEvent : public nsRunnable {
|
|
public:
|
|
NotifyUpdateListenerEvent(CacheFileChunkListener *aCallback,
|
|
CacheFileChunk *aChunk)
|
|
: mCallback(aCallback)
|
|
, mChunk(aChunk)
|
|
{
|
|
LOG(("NotifyUpdateListenerEvent::NotifyUpdateListenerEvent() [this=%p]",
|
|
this));
|
|
MOZ_COUNT_CTOR(NotifyUpdateListenerEvent);
|
|
}
|
|
|
|
protected:
|
|
~NotifyUpdateListenerEvent()
|
|
{
|
|
LOG(("NotifyUpdateListenerEvent::~NotifyUpdateListenerEvent() [this=%p]",
|
|
this));
|
|
MOZ_COUNT_DTOR(NotifyUpdateListenerEvent);
|
|
}
|
|
|
|
public:
|
|
NS_IMETHOD Run()
|
|
{
|
|
LOG(("NotifyUpdateListenerEvent::Run() [this=%p]", this));
|
|
|
|
mCallback->OnChunkUpdated(mChunk);
|
|
return NS_OK;
|
|
}
|
|
|
|
protected:
|
|
nsCOMPtr<CacheFileChunkListener> mCallback;
|
|
RefPtr<CacheFileChunk> mChunk;
|
|
};
|
|
|
|
bool
|
|
CacheFileChunk::DispatchRelease()
|
|
{
|
|
if (NS_IsMainThread()) {
|
|
return false;
|
|
}
|
|
|
|
RefPtr<nsRunnableMethod<CacheFileChunk, MozExternalRefCountType, false> > event =
|
|
NS_NewNonOwningRunnableMethod(this, &CacheFileChunk::Release);
|
|
NS_DispatchToMainThread(event);
|
|
|
|
return true;
|
|
}
|
|
|
|
NS_IMPL_ADDREF(CacheFileChunk)
|
|
NS_IMETHODIMP_(MozExternalRefCountType)
|
|
CacheFileChunk::Release()
|
|
{
|
|
nsrefcnt count = mRefCnt - 1;
|
|
if (DispatchRelease()) {
|
|
// Redispatched to the main thread.
|
|
return count;
|
|
}
|
|
|
|
NS_PRECONDITION(0 != mRefCnt, "dup release");
|
|
count = --mRefCnt;
|
|
NS_LOG_RELEASE(this, count, "CacheFileChunk");
|
|
|
|
if (0 == count) {
|
|
mRefCnt = 1;
|
|
delete (this);
|
|
return 0;
|
|
}
|
|
|
|
// We can safely access this chunk after decreasing mRefCnt since we re-post
|
|
// all calls to Release() happening off the main thread to the main thread.
|
|
// I.e. no other Release() that would delete the object could be run before
|
|
// we call CacheFile::DeactivateChunk().
|
|
//
|
|
// NOTE: we don't grab the CacheFile's lock, so the chunk might be addrefed
|
|
// on another thread before CacheFile::DeactivateChunk() grabs the lock on
|
|
// this thread. To make sure we won't deactivate chunk that was just returned
|
|
// to a new consumer we check mRefCnt once again in
|
|
// CacheFile::DeactivateChunk() after we grab the lock.
|
|
if (mActiveChunk && count == 1) {
|
|
mFile->DeactivateChunk(this);
|
|
}
|
|
|
|
return count;
|
|
}
|
|
|
|
NS_INTERFACE_MAP_BEGIN(CacheFileChunk)
|
|
NS_INTERFACE_MAP_ENTRY(mozilla::net::CacheFileIOListener)
|
|
NS_INTERFACE_MAP_ENTRY(nsISupports)
|
|
NS_INTERFACE_MAP_END_THREADSAFE
|
|
|
|
CacheFileChunk::CacheFileChunk(CacheFile *aFile, uint32_t aIndex,
|
|
bool aInitByWriter)
|
|
: CacheMemoryConsumer(aFile->mOpenAsMemoryOnly ? MEMORY_ONLY : DONT_REPORT)
|
|
, mIndex(aIndex)
|
|
, mState(INITIAL)
|
|
, mStatus(NS_OK)
|
|
, mIsDirty(false)
|
|
, mActiveChunk(false)
|
|
, mDataSize(0)
|
|
, mReportedAllocation(0)
|
|
, mLimitAllocation(!aFile->mOpenAsMemoryOnly && aInitByWriter)
|
|
, mIsPriority(aFile->mPriority)
|
|
, mBuf(nullptr)
|
|
, mBufSize(0)
|
|
, mRWBuf(nullptr)
|
|
, mRWBufSize(0)
|
|
, mReadHash(0)
|
|
, mFile(aFile)
|
|
{
|
|
LOG(("CacheFileChunk::CacheFileChunk() [this=%p, index=%u, initByWriter=%d]",
|
|
this, aIndex, aInitByWriter));
|
|
MOZ_COUNT_CTOR(CacheFileChunk);
|
|
}
|
|
|
|
CacheFileChunk::~CacheFileChunk()
|
|
{
|
|
LOG(("CacheFileChunk::~CacheFileChunk() [this=%p]", this));
|
|
MOZ_COUNT_DTOR(CacheFileChunk);
|
|
|
|
if (mBuf) {
|
|
free(mBuf);
|
|
mBuf = nullptr;
|
|
mBufSize = 0;
|
|
ChunkAllocationChanged();
|
|
}
|
|
|
|
if (mRWBuf) {
|
|
free(mRWBuf);
|
|
mRWBuf = nullptr;
|
|
mRWBufSize = 0;
|
|
ChunkAllocationChanged();
|
|
}
|
|
}
|
|
|
|
void
|
|
CacheFileChunk::InitNew()
|
|
{
|
|
mFile->AssertOwnsLock();
|
|
|
|
LOG(("CacheFileChunk::InitNew() [this=%p]", this));
|
|
|
|
MOZ_ASSERT(mState == INITIAL);
|
|
MOZ_ASSERT(NS_SUCCEEDED(mStatus));
|
|
MOZ_ASSERT(!mBuf);
|
|
MOZ_ASSERT(!mRWBuf);
|
|
MOZ_ASSERT(!mIsDirty);
|
|
MOZ_ASSERT(mDataSize == 0);
|
|
|
|
mState = READY;
|
|
}
|
|
|
|
nsresult
|
|
CacheFileChunk::Read(CacheFileHandle *aHandle, uint32_t aLen,
|
|
CacheHash::Hash16_t aHash,
|
|
CacheFileChunkListener *aCallback)
|
|
{
|
|
mFile->AssertOwnsLock();
|
|
|
|
LOG(("CacheFileChunk::Read() [this=%p, handle=%p, len=%d, listener=%p]",
|
|
this, aHandle, aLen, aCallback));
|
|
|
|
MOZ_ASSERT(mState == INITIAL);
|
|
MOZ_ASSERT(NS_SUCCEEDED(mStatus));
|
|
MOZ_ASSERT(!mBuf);
|
|
MOZ_ASSERT(!mRWBuf);
|
|
MOZ_ASSERT(aLen);
|
|
|
|
nsresult rv;
|
|
|
|
mState = READING;
|
|
|
|
if (CanAllocate(aLen)) {
|
|
mRWBuf = static_cast<char *>(moz_malloc(aLen));
|
|
if (mRWBuf) {
|
|
mRWBufSize = aLen;
|
|
ChunkAllocationChanged();
|
|
}
|
|
}
|
|
|
|
if (!mRWBuf) {
|
|
// Allocation was denied or failed
|
|
SetError(NS_ERROR_OUT_OF_MEMORY);
|
|
return mStatus;
|
|
}
|
|
|
|
DoMemoryReport(MemorySize());
|
|
|
|
rv = CacheFileIOManager::Read(aHandle, mIndex * kChunkSize, mRWBuf, aLen,
|
|
this);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
rv = mIndex ? NS_ERROR_FILE_CORRUPTED : NS_ERROR_FILE_NOT_FOUND;
|
|
SetError(rv);
|
|
} else {
|
|
mListener = aCallback;
|
|
mDataSize = aLen;
|
|
mReadHash = aHash;
|
|
}
|
|
|
|
return rv;
|
|
}
|
|
|
|
nsresult
|
|
CacheFileChunk::Write(CacheFileHandle *aHandle,
|
|
CacheFileChunkListener *aCallback)
|
|
{
|
|
mFile->AssertOwnsLock();
|
|
|
|
LOG(("CacheFileChunk::Write() [this=%p, handle=%p, listener=%p]",
|
|
this, aHandle, aCallback));
|
|
|
|
MOZ_ASSERT(mState == READY);
|
|
MOZ_ASSERT(NS_SUCCEEDED(mStatus));
|
|
MOZ_ASSERT(!mRWBuf);
|
|
MOZ_ASSERT(mBuf);
|
|
MOZ_ASSERT(mDataSize); // Don't write chunk when it is empty
|
|
|
|
nsresult rv;
|
|
|
|
mState = WRITING;
|
|
mRWBuf = mBuf;
|
|
mRWBufSize = mBufSize;
|
|
mBuf = nullptr;
|
|
mBufSize = 0;
|
|
|
|
rv = CacheFileIOManager::Write(aHandle, mIndex * kChunkSize, mRWBuf,
|
|
mDataSize, false, false, this);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
SetError(rv);
|
|
} else {
|
|
mListener = aCallback;
|
|
mIsDirty = false;
|
|
}
|
|
|
|
return rv;
|
|
}
|
|
|
|
void
|
|
CacheFileChunk::WaitForUpdate(CacheFileChunkListener *aCallback)
|
|
{
|
|
mFile->AssertOwnsLock();
|
|
|
|
LOG(("CacheFileChunk::WaitForUpdate() [this=%p, listener=%p]",
|
|
this, aCallback));
|
|
|
|
MOZ_ASSERT(mFile->mOutput);
|
|
MOZ_ASSERT(IsReady());
|
|
|
|
#ifdef DEBUG
|
|
for (uint32_t i = 0 ; i < mUpdateListeners.Length() ; i++) {
|
|
MOZ_ASSERT(mUpdateListeners[i]->mCallback != aCallback);
|
|
}
|
|
#endif
|
|
|
|
ChunkListenerItem *item = new ChunkListenerItem();
|
|
item->mTarget = CacheFileIOManager::IOTarget();
|
|
if (!item->mTarget) {
|
|
LOG(("CacheFileChunk::WaitForUpdate() - Cannot get Cache I/O thread! Using "
|
|
"main thread for callback."));
|
|
item->mTarget = do_GetMainThread();
|
|
}
|
|
item->mCallback = aCallback;
|
|
MOZ_ASSERT(item->mTarget);
|
|
item->mCallback = aCallback;
|
|
|
|
mUpdateListeners.AppendElement(item);
|
|
}
|
|
|
|
nsresult
|
|
CacheFileChunk::CancelWait(CacheFileChunkListener *aCallback)
|
|
{
|
|
mFile->AssertOwnsLock();
|
|
|
|
LOG(("CacheFileChunk::CancelWait() [this=%p, listener=%p]", this, aCallback));
|
|
|
|
MOZ_ASSERT(IsReady());
|
|
|
|
uint32_t i;
|
|
for (i = 0 ; i < mUpdateListeners.Length() ; i++) {
|
|
ChunkListenerItem *item = mUpdateListeners[i];
|
|
|
|
if (item->mCallback == aCallback) {
|
|
mUpdateListeners.RemoveElementAt(i);
|
|
delete item;
|
|
break;
|
|
}
|
|
}
|
|
|
|
#ifdef DEBUG
|
|
for ( ; i < mUpdateListeners.Length() ; i++) {
|
|
MOZ_ASSERT(mUpdateListeners[i]->mCallback != aCallback);
|
|
}
|
|
#endif
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
CacheFileChunk::NotifyUpdateListeners()
|
|
{
|
|
mFile->AssertOwnsLock();
|
|
|
|
LOG(("CacheFileChunk::NotifyUpdateListeners() [this=%p]", this));
|
|
|
|
MOZ_ASSERT(IsReady());
|
|
|
|
nsresult rv, rv2;
|
|
|
|
rv = NS_OK;
|
|
for (uint32_t i = 0 ; i < mUpdateListeners.Length() ; i++) {
|
|
ChunkListenerItem *item = mUpdateListeners[i];
|
|
|
|
LOG(("CacheFileChunk::NotifyUpdateListeners() - Notifying listener %p "
|
|
"[this=%p]", item->mCallback.get(), this));
|
|
|
|
RefPtr<NotifyUpdateListenerEvent> ev;
|
|
ev = new NotifyUpdateListenerEvent(item->mCallback, this);
|
|
rv2 = item->mTarget->Dispatch(ev, NS_DISPATCH_NORMAL);
|
|
if (NS_FAILED(rv2) && NS_SUCCEEDED(rv))
|
|
rv = rv2;
|
|
delete item;
|
|
}
|
|
|
|
mUpdateListeners.Clear();
|
|
|
|
return rv;
|
|
}
|
|
|
|
uint32_t
|
|
CacheFileChunk::Index()
|
|
{
|
|
return mIndex;
|
|
}
|
|
|
|
CacheHash::Hash16_t
|
|
CacheFileChunk::Hash()
|
|
{
|
|
mFile->AssertOwnsLock();
|
|
|
|
MOZ_ASSERT(!mListener);
|
|
MOZ_ASSERT(IsReady());
|
|
|
|
return CacheHash::Hash16(mDataSize ? BufForReading() : nullptr, mDataSize);
|
|
}
|
|
|
|
uint32_t
|
|
CacheFileChunk::DataSize()
|
|
{
|
|
mFile->AssertOwnsLock();
|
|
return mDataSize;
|
|
}
|
|
|
|
void
|
|
CacheFileChunk::UpdateDataSize(uint32_t aOffset, uint32_t aLen, bool aEOF)
|
|
{
|
|
mFile->AssertOwnsLock();
|
|
|
|
MOZ_ASSERT(!aEOF, "Implement me! What to do with opened streams?");
|
|
MOZ_ASSERT(aOffset <= mDataSize);
|
|
MOZ_ASSERT(aLen != 0);
|
|
|
|
// UpdateDataSize() is called only when we've written some data to the chunk
|
|
// and we never write data anymore once some error occurs.
|
|
MOZ_ASSERT(NS_SUCCEEDED(mStatus));
|
|
|
|
LOG(("CacheFileChunk::UpdateDataSize() [this=%p, offset=%d, len=%d, EOF=%d]",
|
|
this, aOffset, aLen, aEOF));
|
|
|
|
mIsDirty = true;
|
|
|
|
int64_t fileSize = kChunkSize * mIndex + aOffset + aLen;
|
|
bool notify = false;
|
|
|
|
if (fileSize > mFile->mDataSize)
|
|
mFile->mDataSize = fileSize;
|
|
|
|
if (aOffset + aLen > mDataSize) {
|
|
mDataSize = aOffset + aLen;
|
|
notify = true;
|
|
}
|
|
|
|
if (mState == READY || mState == WRITING) {
|
|
MOZ_ASSERT(mValidityMap.Length() == 0);
|
|
|
|
if (notify) {
|
|
NotifyUpdateListeners();
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
// We're still waiting for data from the disk. This chunk cannot be used by
|
|
// input stream, so there must be no update listener. We also need to keep
|
|
// track of where the data is written so that we can correctly merge the new
|
|
// data with the old one.
|
|
|
|
MOZ_ASSERT(mUpdateListeners.Length() == 0);
|
|
MOZ_ASSERT(mState == READING);
|
|
|
|
mValidityMap.AddPair(aOffset, aLen);
|
|
mValidityMap.Log();
|
|
}
|
|
|
|
nsresult
|
|
CacheFileChunk::OnFileOpened(CacheFileHandle *aHandle, nsresult aResult)
|
|
{
|
|
MOZ_CRASH("CacheFileChunk::OnFileOpened should not be called!");
|
|
return NS_ERROR_UNEXPECTED;
|
|
}
|
|
|
|
nsresult
|
|
CacheFileChunk::OnDataWritten(CacheFileHandle *aHandle, const char *aBuf,
|
|
nsresult aResult)
|
|
{
|
|
LOG(("CacheFileChunk::OnDataWritten() [this=%p, handle=%p, result=0x%08x]",
|
|
this, aHandle, aResult));
|
|
|
|
nsCOMPtr<CacheFileChunkListener> listener;
|
|
|
|
{
|
|
CacheFileAutoLock lock(mFile);
|
|
|
|
MOZ_ASSERT(mState == WRITING);
|
|
MOZ_ASSERT(mListener);
|
|
|
|
if (NS_WARN_IF(NS_FAILED(aResult))) {
|
|
SetError(aResult);
|
|
}
|
|
|
|
mState = READY;
|
|
|
|
if (!mBuf) {
|
|
mBuf = mRWBuf;
|
|
mBufSize = mRWBufSize;
|
|
mRWBuf = nullptr;
|
|
mRWBufSize = 0;
|
|
} else {
|
|
free(mRWBuf);
|
|
mRWBuf = nullptr;
|
|
mRWBufSize = 0;
|
|
ChunkAllocationChanged();
|
|
}
|
|
|
|
|
|
DoMemoryReport(MemorySize());
|
|
|
|
mListener.swap(listener);
|
|
}
|
|
|
|
listener->OnChunkWritten(aResult, this);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
CacheFileChunk::OnDataRead(CacheFileHandle *aHandle, char *aBuf,
|
|
nsresult aResult)
|
|
{
|
|
LOG(("CacheFileChunk::OnDataRead() [this=%p, handle=%p, result=0x%08x]",
|
|
this, aHandle, aResult));
|
|
|
|
nsCOMPtr<CacheFileChunkListener> listener;
|
|
|
|
{
|
|
CacheFileAutoLock lock(mFile);
|
|
|
|
MOZ_ASSERT(mState == READING);
|
|
MOZ_ASSERT(mListener);
|
|
|
|
if (NS_SUCCEEDED(aResult)) {
|
|
CacheHash::Hash16_t hash = CacheHash::Hash16(mRWBuf, mRWBufSize);
|
|
if (hash != mReadHash) {
|
|
LOG(("CacheFileChunk::OnDataRead() - Hash mismatch! Hash of the data is"
|
|
" %hx, hash in metadata is %hx. [this=%p, idx=%d]",
|
|
hash, mReadHash, this, mIndex));
|
|
aResult = NS_ERROR_FILE_CORRUPTED;
|
|
}
|
|
else {
|
|
if (!mBuf) {
|
|
// Just swap the buffers if we don't have mBuf yet
|
|
MOZ_ASSERT(mDataSize == mRWBufSize);
|
|
mBuf = mRWBuf;
|
|
mBufSize = mRWBufSize;
|
|
mRWBuf = nullptr;
|
|
mRWBufSize = 0;
|
|
} else {
|
|
LOG(("CacheFileChunk::OnDataRead() - Merging buffers. [this=%p]",
|
|
this));
|
|
|
|
// Merge data with write buffer
|
|
if (mRWBufSize >= mBufSize) {
|
|
// The new data will fit into the buffer that contains data read
|
|
// from the disk. Simply copy the valid pieces.
|
|
mValidityMap.Log();
|
|
for (uint32_t i = 0; i < mValidityMap.Length(); i++) {
|
|
if (mValidityMap[i].Offset() + mValidityMap[i].Len() > mBufSize) {
|
|
MOZ_CRASH("Unexpected error in validity map!");
|
|
}
|
|
memcpy(mRWBuf + mValidityMap[i].Offset(),
|
|
mBuf + mValidityMap[i].Offset(), mValidityMap[i].Len());
|
|
}
|
|
mValidityMap.Clear();
|
|
|
|
free(mBuf);
|
|
mBuf = mRWBuf;
|
|
mBufSize = mRWBufSize;
|
|
mRWBuf = nullptr;
|
|
mRWBufSize = 0;
|
|
ChunkAllocationChanged();
|
|
} else {
|
|
// Buffer holding the new data is larger. Use it as the destination
|
|
// buffer to avoid reallocating mRWBuf. We need to copy those pieces
|
|
// from mRWBuf which are not valid in mBuf.
|
|
uint32_t invalidOffset = 0;
|
|
uint32_t invalidLength;
|
|
mValidityMap.Log();
|
|
for (uint32_t i = 0; i < mValidityMap.Length(); i++) {
|
|
MOZ_ASSERT(invalidOffset <= mValidityMap[i].Offset());
|
|
invalidLength = mValidityMap[i].Offset() - invalidOffset;
|
|
if (invalidLength > 0) {
|
|
if (invalidOffset + invalidLength > mRWBufSize) {
|
|
MOZ_CRASH("Unexpected error in validity map!");
|
|
}
|
|
memcpy(mBuf + invalidOffset, mRWBuf + invalidOffset,
|
|
invalidLength);
|
|
}
|
|
invalidOffset = mValidityMap[i].Offset() + mValidityMap[i].Len();
|
|
}
|
|
if (invalidOffset < mRWBufSize) {
|
|
invalidLength = mRWBufSize - invalidOffset;
|
|
memcpy(mBuf + invalidOffset, mRWBuf + invalidOffset,
|
|
invalidLength);
|
|
}
|
|
mValidityMap.Clear();
|
|
|
|
free(mRWBuf);
|
|
mRWBuf = nullptr;
|
|
mRWBufSize = 0;
|
|
ChunkAllocationChanged();
|
|
}
|
|
|
|
DoMemoryReport(MemorySize());
|
|
}
|
|
}
|
|
}
|
|
|
|
if (NS_FAILED(aResult)) {
|
|
aResult = mIndex ? NS_ERROR_FILE_CORRUPTED : NS_ERROR_FILE_NOT_FOUND;
|
|
SetError(aResult);
|
|
mDataSize = 0;
|
|
}
|
|
|
|
mState = READY;
|
|
mListener.swap(listener);
|
|
}
|
|
|
|
listener->OnChunkRead(aResult, this);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
CacheFileChunk::OnFileDoomed(CacheFileHandle *aHandle, nsresult aResult)
|
|
{
|
|
MOZ_CRASH("CacheFileChunk::OnFileDoomed should not be called!");
|
|
return NS_ERROR_UNEXPECTED;
|
|
}
|
|
|
|
nsresult
|
|
CacheFileChunk::OnEOFSet(CacheFileHandle *aHandle, nsresult aResult)
|
|
{
|
|
MOZ_CRASH("CacheFileChunk::OnEOFSet should not be called!");
|
|
return NS_ERROR_UNEXPECTED;
|
|
}
|
|
|
|
nsresult
|
|
CacheFileChunk::OnFileRenamed(CacheFileHandle *aHandle, nsresult aResult)
|
|
{
|
|
MOZ_CRASH("CacheFileChunk::OnFileRenamed should not be called!");
|
|
return NS_ERROR_UNEXPECTED;
|
|
}
|
|
|
|
bool
|
|
CacheFileChunk::IsReady() const
|
|
{
|
|
mFile->AssertOwnsLock();
|
|
|
|
return (NS_SUCCEEDED(mStatus) && (mState == READY || mState == WRITING));
|
|
}
|
|
|
|
bool
|
|
CacheFileChunk::IsDirty() const
|
|
{
|
|
mFile->AssertOwnsLock();
|
|
|
|
return mIsDirty;
|
|
}
|
|
|
|
nsresult
|
|
CacheFileChunk::GetStatus()
|
|
{
|
|
mFile->AssertOwnsLock();
|
|
|
|
return mStatus;
|
|
}
|
|
|
|
void
|
|
CacheFileChunk::SetError(nsresult aStatus)
|
|
{
|
|
MOZ_ASSERT(NS_FAILED(aStatus));
|
|
|
|
if (NS_FAILED(mStatus)) {
|
|
// Remember only the first error code.
|
|
return;
|
|
}
|
|
|
|
mStatus = aStatus;
|
|
}
|
|
|
|
char *
|
|
CacheFileChunk::BufForWriting() const
|
|
{
|
|
mFile->AssertOwnsLock();
|
|
|
|
MOZ_ASSERT(mBuf); // Writer should always first call EnsureBufSize()
|
|
|
|
MOZ_ASSERT(NS_SUCCEEDED(mStatus));
|
|
MOZ_ASSERT((mState == READY && !mRWBuf) ||
|
|
(mState == WRITING && mRWBuf) ||
|
|
(mState == READING && mRWBuf));
|
|
|
|
return mBuf;
|
|
}
|
|
|
|
const char *
|
|
CacheFileChunk::BufForReading() const
|
|
{
|
|
mFile->AssertOwnsLock();
|
|
|
|
MOZ_ASSERT((mState == READY && mBuf && !mRWBuf) ||
|
|
(mState == WRITING && mRWBuf));
|
|
|
|
return mBuf ? mBuf : mRWBuf;
|
|
}
|
|
|
|
MOZ_WARN_UNUSED_RESULT nsresult
|
|
CacheFileChunk::EnsureBufSize(uint32_t aBufSize)
|
|
{
|
|
mFile->AssertOwnsLock();
|
|
|
|
// EnsureBufSize() is called only when we want to write some data to the chunk
|
|
// and we never write data anymore once some error occurs.
|
|
MOZ_ASSERT(NS_SUCCEEDED(mStatus));
|
|
|
|
if (mBufSize >= aBufSize) {
|
|
return NS_OK;
|
|
}
|
|
|
|
bool copy = false;
|
|
if (!mBuf && mState == WRITING) {
|
|
// We need to duplicate the data that is being written on the background
|
|
// thread, so make sure that all the data fits into the new buffer.
|
|
copy = true;
|
|
|
|
if (mRWBufSize > aBufSize)
|
|
aBufSize = mRWBufSize;
|
|
}
|
|
|
|
// find smallest power of 2 greater than or equal to aBufSize
|
|
aBufSize--;
|
|
aBufSize |= aBufSize >> 1;
|
|
aBufSize |= aBufSize >> 2;
|
|
aBufSize |= aBufSize >> 4;
|
|
aBufSize |= aBufSize >> 8;
|
|
aBufSize |= aBufSize >> 16;
|
|
aBufSize++;
|
|
|
|
const uint32_t minBufSize = kMinBufSize;
|
|
const uint32_t maxBufSize = kChunkSize;
|
|
aBufSize = clamped(aBufSize, minBufSize, maxBufSize);
|
|
|
|
if (!CanAllocate(aBufSize - mBufSize)) {
|
|
SetError(NS_ERROR_OUT_OF_MEMORY);
|
|
return mStatus;
|
|
}
|
|
|
|
char *newBuf = static_cast<char *>(moz_realloc(mBuf, aBufSize));
|
|
if (!newBuf) {
|
|
SetError(NS_ERROR_OUT_OF_MEMORY);
|
|
return mStatus;
|
|
}
|
|
|
|
mBuf = newBuf;
|
|
mBufSize = aBufSize;
|
|
ChunkAllocationChanged();
|
|
|
|
if (copy)
|
|
memcpy(mBuf, mRWBuf, mRWBufSize);
|
|
|
|
DoMemoryReport(MemorySize());
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
// Memory reporting
|
|
|
|
size_t
|
|
CacheFileChunk::SizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf) const
|
|
{
|
|
size_t n = 0;
|
|
n += mallocSizeOf(mBuf);
|
|
n += mallocSizeOf(mRWBuf);
|
|
n += mValidityMap.SizeOfExcludingThis(mallocSizeOf);
|
|
|
|
return n;
|
|
}
|
|
|
|
size_t
|
|
CacheFileChunk::SizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf) const
|
|
{
|
|
return mallocSizeOf(this) + SizeOfExcludingThis(mallocSizeOf);
|
|
}
|
|
|
|
bool
|
|
CacheFileChunk::CanAllocate(uint32_t aSize)
|
|
{
|
|
if (!mLimitAllocation) {
|
|
return true;
|
|
}
|
|
|
|
LOG(("CacheFileChunk::CanAllocate() [this=%p, size=%u]", this, aSize));
|
|
|
|
uint32_t limit = CacheObserver::MaxDiskChunksMemoryUsage(mIsPriority);
|
|
if (limit == 0) {
|
|
return true;
|
|
}
|
|
|
|
uint32_t usage = ChunksMemoryUsage();
|
|
if (usage + aSize > limit) {
|
|
LOG(("CacheFileChunk::CanAllocate() - Returning false. [this=%p]", this));
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
void
|
|
CacheFileChunk::ChunkAllocationChanged()
|
|
{
|
|
if (!mLimitAllocation) {
|
|
return;
|
|
}
|
|
|
|
ChunksMemoryUsage() -= mReportedAllocation;
|
|
mReportedAllocation = mBufSize + mRWBufSize;
|
|
ChunksMemoryUsage() += mReportedAllocation;
|
|
LOG(("CacheFileChunk::ChunkAllocationChanged() - %s chunks usage %u "
|
|
"[this=%p]", mIsPriority ? "Priority" : "Normal",
|
|
static_cast<uint32_t>(ChunksMemoryUsage()), this));
|
|
}
|
|
|
|
mozilla::Atomic<uint32_t>& CacheFileChunk::ChunksMemoryUsage()
|
|
{
|
|
static mozilla::Atomic<uint32_t> chunksMemoryUsage(0);
|
|
static mozilla::Atomic<uint32_t> prioChunksMemoryUsage(0);
|
|
return mIsPriority ? prioChunksMemoryUsage : chunksMemoryUsage;
|
|
}
|
|
|
|
} // namespace net
|
|
} // namespace mozilla
|