mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
8a0a002cf2
- Bug 1148708: Add missing 'override' annotations in DocAccessibleChild.h. rs=ehsan (d606358545)
- Bug 1210408 - make nsMaiInterfaceAction work with proxies, r=tbsaunde (f7c819c6ae)
- Bug 1210407 - teach nsMaiInterfaceTable to use proxies, r=tbsaunde (4ca4f10b5f)
- bug 1185157 make sure we don't send an event to a destroyed ipc document r=billm (23acf53f75)
- bug 1214864 - make SetCarretOffset() async r=davidb (e3079e9b2d)
- missing of Bug 1139972 - IPC Proxy for charAt, r=tbsaunde (e9593ed752)
- bug 1191598 - Pass MOZ_CURRENT_PROJECT in environment when running post-build automation steps for universal mac builds. r=gps (fc342c6ced)
- Bug 1164596 - Add mach android-emulator command; r=ahal (afeb9b27d1)
- Bug 1223149 - Add basic usage documentation for mach build; r=glandium (bfb802d175)
- Bug 1182301 - Improve 'mach build' notifications. r=gps (2c65a122d1)
- Bug 1184696 - Add clobber targets to |mach clobber|; Ability to clobber compiled python files, r=gps (35d8be292e)
- Bug 1117958 - Allow any debugging options to the run or gtest mach subcommands to automatically enable debugging. r=gps (32f986af4b)
- Bug 1180081 - Properly rebuild gtest/libxul before running gtests. r=gps (80db9a3d49)
- Bug 1171647, part 1 - Define a new function to convert the mode to a string. r=njn (61ad16f5ba)
- Bug 1171647, part 2 - Remove redundant assertion for dark matter mode. r=njn (b5ac9519f3)
- Bug 1058178, part 1 - Implement DMD heap scanning mode. r=njn (60e1079536)
- Bug 1058178, part 2 - Implement address clamping analysis for DMD scan logs. r=njn (45c0326b93)
- Bug 1102388 - Fix DMD static constructor ordering dependency. r=mccr8 (59b87897a1)
- Bug 1128705 - Don't redefine PAGE_SIZE in DMD if it's already defined. r=erahm (49216348ee)
- Bug 1179042 - Add a script for analyzing memory blocks using a heap scan DMD log. r=njn DONTBUILD (1c08d2d66e)
- Bug 1207245 - part 6 - rename nsRefPtr<T> to RefPtr<T>; r=ehsan; a=Tomcat (1c999d139b)
- Bug 1158772 - fix non-idiomatic memset call in nsDeque.cpp; r=erahm (de6b555245)
- Bug 1199400 - Part 1: Use CheckedInt when growing nsDeque capacity. r=froydnj (dfdf6814a3)
- Bug 1199400 - Part 0: Remove unused nsDequeIterator. r=froydnj (38d69d7f47)
- Bug 1199400 - Part 2: Add tests for possible nsDeque corner cases. r=froydnj (931baff195)
- Bug 1201997 - Part 1 - Converted compiled test to gtest for nsDeque class. Added tests to test untested methods. r=froydn (e893916651)
- Bug 1201997 - Part 2 - Removing unused methods from the nsDeque class. r=froydn (41595a90ac)
- Bug 1201997 - Part 3 - Make internally used methods private. r=froydn (8cd3afd96f)
- Bug 1201997 - Part 4 - Change size and offset variables to size_t.r=froydn (73eabc8d60)
- Bug 1215140 P1 Add an nsIConsoleReportCollector interface to support navigation channel logging. r=bz (8a41535e2b)
- Bug 1215140 P2 Make HttpBaseChannel implement nsIConsoleReportCollector. r=bz (75fca301f2)
- Bug 1197679 - If nsUnknownDecoder is involved in e10s DivertToParent can break. r=jduell (5d94a12504)
- Bug 1178991 - smartptr for http converter r=hurley (8e7fbc8443)
- bug 366559 - patch 2, fix nsHTTPCompressConv indentation r=bagder (ba762da587)
- bug 366559 - patch 3, fix nsHTTPCompressConv bracing style r=bagder (54195ab451)
- bits of bug 366559 - patch 7, content-encoding brotli for http (f0b4051022)
- Bug 1205112 - Make PushEvent.data nullable. r=mt,smaug (775db32856)
- Bug 1193414 - SharedWorkers thread should be kept alive also when the SharedWorker object is CCed, r=khuey (b77ea8125c)
- Bug 1206520: Add about:config prefs to enable throwing on asm.js validation failures; r=bz (c42126665d)
- Bug 1193414 - Telemetry for SharedWorker spawning. r=bkelly (77984b7bcc)
- Bug 1205676 - Enable WPT service-worker/unregister-then-register-new-script.https.html in e10s, r=nsm (ec24939cf6)
- Bug 1193133 - Throw when calling postMessage from a Service Worker dom object with no global. r=bkelly (526dcacfab)
- Bug 1181871 P1 Only enforce Cache Context shared data destruction on target thread after init. r=ehsan (cdbf3ed3a8)
- Bug 1181871 P2 Fix ServiceWorkerManager usage of stack-based ErrorResult. r=ehsan (c449195d90)
- minor cleanup and missing bit of 1198230 (02f459db05)
- Bug 1143717 - Implement the ServiceWorkerMessageEvent interface. r=baku (027b3465f2)
- fix misspatch (708eee4e84)
- Bug 1188545 - Disentangle service workers from shared workers and refactor event dispatching code into a separate class. r=nsm,mrbkap (fb5b5341c9)
- Bug 1205228 - Change PackagedAppVerifier to notify the verification result asynchronously. r=valentin. (9edda0fa00)
- Bug 1178518 - Packaged App Utils. r=valentin (f60f3b7a93)
- Bug 1213150 - Part 1: Add a nsContentUtils::IsNonSubresourceRequest helper; r=jdm (b509cc3cc9)
- Bug 1213150 - Part 2: Rework ShouldPrepareForIntercept() in terms of subresource requests; r=jdm (2e92fe8780)
- Bug 1213150 - Part 3: Remove nsIInterceptedChannel.isNavigation; r=jdm (becf1cc12f)
- Bug 1213150 follow-up: fix build bustage (8d73d6ca73)
- Bug 1198394 - Part 1: Allow interception of HSTS upgraded connections in non-e10s mode; r=mcmanus (f504c5be08)
- Bug 1198394 - Part 2: Add a test for interception of HSTS upgraded connections; r=jdm (054e984eef)
- Bug 1187011 - Don't allow response body with null body status. r=bkelly (b1860741d1)
- missing bit of 1140788 (29d319712e)
- Bug 1213436 - Reject core dumps with node IDs that don't fit in an IEEE 754 double; r=sfink (3c1f6fdda0)
- Bug 1211006 - Add Debugger.Source.prototype.canonicalId; r=ejpbruel (eef7b79fce)
- Bug 1199218 - Implement JS::ubi::Node::size for js::LazyScript referents; r=sfink (098a48d240)
- Bug 1220031 - Add JS::ubi::Node::scriptFilename; r=sfink (6b824ae680)
- Bug 1143575. Remove unused MediaQueue::Empty. r=cpearce (de737f3433)
- Bug 1209933 - Make sure all parent runtime pointers are the topmost parent, r=billm. (fe824d967d)
- Bug 1197012 - Fix ThrowTypeError in Notification. r=mccr8 (0b1a097526)
- Bug 1197893 - Check the number of arguments for ThrowTypeError() and ThrowRangeError() at compile time. r=peterv (d98c7d78a0)
- Bug 1142083 - Add test for IDN Unicode domain redirect. r=mcmanus (0c8961fe17)
- Bug 1187159 - Add mochitest for loading packaged apps (iframe+fetch+mozapp) r=jduell (ce90ea561b)
- Bug 1186290 - Notify TabParent to switch process when loading a signed package. r=honzab, r=kanru. (c58a14554a)
- fix (15e2df75eb)
- Bug 1206124 P1 Fix "same-origin" CORS credentials in FetchDriver. r=ehsan (fae1bb6ab3)
- Bug 1206124 P2 Test fetch() with credentials and redirects. r=ehsan (ffc6254112)
- Bug 1211751: Remove nsIChannelEventSink-forwarding from EventSource and FetchDriver. It's never needed. r=smaug (adafe5737a)
- Bug 1212433 Fail fetch() calls that require preflight and also redirect. r=sicking a=abillings (c0d6742b9e)
- Bug 1193128 - Fix base64 decoding when fetching data URIs. r=baku (80bafa291a)
- Bug 1195167 part 1: Let necko handle all protocols. r=bkelly (bb932b0ada)
- Bug 1195167 part 2: Remove redundant aCORSFlag argument and instead use mCORSFlagEverSet. r=bkelly (beadafcad0)
- Bug 1195167 part 3: Remove more scheme-specific handling from FetchDriver. r=bkelly (d00b38db9e)
- Bug 1195167 part 4: Remove FetchDriver::BasicFetch since it is empty. r=bkelly (c5ed097267)
- Bug 1210413 P2 Test CORS credentials on cross-origin redirects. r=sicking a=dveditz (b4eeb8aac0)
- Bug 1210413 P1 Propagate new channel load flags from child to parent on redirect. r=jduell a=dveditz (8b329af4fa)
- Bug 1195167 part 5: Make FetchDriver use AsyncOpen2. r=bkelly (cc217c4cc1)
- Bug 1195167 part 6: Some code simplification since necko handles fetch recursion. r=bkelly (f3b6da2262)
- Bug 1195167: Followup to fix test which I forgot to change (81e7439a2e)
- Bug 1215746: Remove RequestMode::Cors_with_forced_preflight. r=bkelly (0336e812b6)
- Bug 1211000: Move CORS preflight logic from nsCORSListenerProxy to nsCORSPreflightListener. r=ehsan (bf2f71cf22)
- missing bit of Bug 1211443 - Drop scheduled update if decoder initialization isn't done yet. r=jya (f6bc074e33)
- Bug 1182571: Fix nsILoadInfo->GetContentPolicyType API to be less ambigious. Audit and fix all users of it. r=ckerschb (5af6fa7442)
- fix (e40c8e7625)
- Bug 1173811 - Part 1: Propagate the response URL to intercepted channels when necessary (non-e10s). r=mayhemer,bkelly (26f4f13c28)
- Bug 1173811 - Part 2: Propagate the response URL to intercepted channels when necessary (e10s). r=mayhemer,bkelly (a603fe1df2)
- Bug 1154309 - Add New Resource Timing Fields r=bz,hurley (1d14eb6bef)
- Bug 1175685 - add OriginAttribute to LoadInfo. r=jonas, r=ckerschb, r=michal (a5d18bb637)
- Bug 1175685 - add OriginAttribute to LoadInfo. r=jonas, r=ckerschb, r=michal (fb07d2c8aa)
- Bug 1212904 P1 Add a LoadTainting enumeration. r=jduell (a1db8a3e99)
- Bug 1212904 P2 Add LoadTainting information to nsILoadInfo. r=jduell (2482e5e334)
- Bug 1221151 - use [infallible] in nsILoadInfo.idl instead of manual %{C++ blocks; r=jduell (aae73129b6)
- Bug 1045891 - CSP 2 child-src implementation r=ckerschb (792920aeb9)
- Bug 1219931 - CSP: Don't allow removing a policy (r=sicking) (9daaab4186)
- Bug 1208661 - Dump client-side layer textures. r=BenWa (1f2d17d515)
356 lines
12 KiB
C++
356 lines
12 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim:set ts=2 sw=2 sts=2 et cindent: */
|
|
/* 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 "FileBlockCache.h"
|
|
#include "VideoUtils.h"
|
|
#include "prio.h"
|
|
#include <algorithm>
|
|
|
|
namespace mozilla {
|
|
|
|
nsresult FileBlockCache::Open(PRFileDesc* aFD)
|
|
{
|
|
NS_ASSERTION(NS_IsMainThread(), "Only call on main thread");
|
|
NS_ENSURE_TRUE(aFD != nullptr, NS_ERROR_FAILURE);
|
|
{
|
|
MonitorAutoLock mon(mFileMonitor);
|
|
mFD = aFD;
|
|
}
|
|
{
|
|
MonitorAutoLock mon(mDataMonitor);
|
|
nsresult res = NS_NewThread(getter_AddRefs(mThread),
|
|
nullptr,
|
|
SharedThreadPool::kStackSize);
|
|
mIsOpen = NS_SUCCEEDED(res);
|
|
return res;
|
|
}
|
|
}
|
|
|
|
FileBlockCache::FileBlockCache()
|
|
: mFileMonitor("MediaCache.Writer.IO.Monitor"),
|
|
mFD(nullptr),
|
|
mFDCurrentPos(0),
|
|
mDataMonitor("MediaCache.Writer.Data.Monitor"),
|
|
mIsWriteScheduled(false),
|
|
mIsOpen(false)
|
|
{
|
|
MOZ_COUNT_CTOR(FileBlockCache);
|
|
}
|
|
|
|
FileBlockCache::~FileBlockCache()
|
|
{
|
|
NS_ASSERTION(!mIsOpen, "Should Close() FileBlockCache before destroying");
|
|
{
|
|
// Note, mThread will be shutdown by the time this runs, so we won't
|
|
// block while taking mFileMonitor.
|
|
MonitorAutoLock mon(mFileMonitor);
|
|
if (mFD) {
|
|
PRStatus prrc;
|
|
prrc = PR_Close(mFD);
|
|
if (prrc != PR_SUCCESS) {
|
|
NS_WARNING("PR_Close() failed.");
|
|
}
|
|
mFD = nullptr;
|
|
}
|
|
}
|
|
MOZ_COUNT_DTOR(FileBlockCache);
|
|
}
|
|
|
|
|
|
void FileBlockCache::Close()
|
|
{
|
|
NS_ASSERTION(NS_IsMainThread(), "Only call on main thread");
|
|
MonitorAutoLock mon(mDataMonitor);
|
|
|
|
mIsOpen = false;
|
|
|
|
if (mThread) {
|
|
// We must shut down the thread in another runnable. This is called
|
|
// while we're shutting down the media cache, and nsIThread::Shutdown()
|
|
// can cause events to run before it completes, which could end up
|
|
// opening more streams, while the media cache is shutting down and
|
|
// releasing memory etc! Also note we close mFD in the destructor so
|
|
// as to not disturb any IO that's currently running.
|
|
nsCOMPtr<nsIThread> mainThread = do_GetMainThread();
|
|
if (mainThread) {
|
|
nsCOMPtr<nsIRunnable> event = new ShutdownThreadEvent(mThread);
|
|
mainThread->Dispatch(event.forget(), NS_DISPATCH_NORMAL);
|
|
} else {
|
|
// we're on Mainthread already, *and* the event queues are already
|
|
// shut down, so no events should occur - certainly not creations of
|
|
// new streams.
|
|
mThread->Shutdown();
|
|
}
|
|
}
|
|
}
|
|
|
|
nsresult FileBlockCache::WriteBlock(uint32_t aBlockIndex, const uint8_t* aData)
|
|
{
|
|
MonitorAutoLock mon(mDataMonitor);
|
|
|
|
if (!mIsOpen)
|
|
return NS_ERROR_FAILURE;
|
|
|
|
// Check if we've already got a pending write scheduled for this block.
|
|
mBlockChanges.EnsureLengthAtLeast(aBlockIndex + 1);
|
|
bool blockAlreadyHadPendingChange = mBlockChanges[aBlockIndex] != nullptr;
|
|
mBlockChanges[aBlockIndex] = new BlockChange(aData);
|
|
|
|
if (!blockAlreadyHadPendingChange || !mChangeIndexList.Contains(aBlockIndex)) {
|
|
// We either didn't already have a pending change for this block, or we
|
|
// did but we didn't have an entry for it in mChangeIndexList (we're in the process
|
|
// of writing it and have removed the block's index out of mChangeIndexList
|
|
// in Run() but not finished writing the block to file yet). Add the blocks
|
|
// index to the end of mChangeIndexList to ensure the block is written as
|
|
// as soon as possible.
|
|
mChangeIndexList.PushBack(aBlockIndex);
|
|
}
|
|
NS_ASSERTION(mChangeIndexList.Contains(aBlockIndex), "Must have entry for new block");
|
|
|
|
EnsureWriteScheduled();
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
void FileBlockCache::EnsureWriteScheduled()
|
|
{
|
|
mDataMonitor.AssertCurrentThreadOwns();
|
|
|
|
if (!mIsWriteScheduled) {
|
|
mThread->Dispatch(this, NS_DISPATCH_NORMAL);
|
|
mIsWriteScheduled = true;
|
|
}
|
|
}
|
|
|
|
nsresult FileBlockCache::Seek(int64_t aOffset)
|
|
{
|
|
mFileMonitor.AssertCurrentThreadOwns();
|
|
|
|
if (mFDCurrentPos != aOffset) {
|
|
int64_t result = PR_Seek64(mFD, aOffset, PR_SEEK_SET);
|
|
if (result != aOffset) {
|
|
NS_WARNING("Failed to seek media cache file");
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
mFDCurrentPos = result;
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult FileBlockCache::ReadFromFile(int64_t aOffset,
|
|
uint8_t* aDest,
|
|
int32_t aBytesToRead,
|
|
int32_t& aBytesRead)
|
|
{
|
|
mFileMonitor.AssertCurrentThreadOwns();
|
|
|
|
nsresult res = Seek(aOffset);
|
|
if (NS_FAILED(res)) return res;
|
|
|
|
aBytesRead = PR_Read(mFD, aDest, aBytesToRead);
|
|
if (aBytesRead <= 0)
|
|
return NS_ERROR_FAILURE;
|
|
mFDCurrentPos += aBytesRead;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult FileBlockCache::WriteBlockToFile(int32_t aBlockIndex,
|
|
const uint8_t* aBlockData)
|
|
{
|
|
mFileMonitor.AssertCurrentThreadOwns();
|
|
|
|
nsresult rv = Seek(BlockIndexToOffset(aBlockIndex));
|
|
if (NS_FAILED(rv)) return rv;
|
|
|
|
int32_t amount = PR_Write(mFD, aBlockData, BLOCK_SIZE);
|
|
if (amount < BLOCK_SIZE) {
|
|
NS_WARNING("Failed to write media cache block!");
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
mFDCurrentPos += BLOCK_SIZE;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult FileBlockCache::MoveBlockInFile(int32_t aSourceBlockIndex,
|
|
int32_t aDestBlockIndex)
|
|
{
|
|
mFileMonitor.AssertCurrentThreadOwns();
|
|
|
|
uint8_t buf[BLOCK_SIZE];
|
|
int32_t bytesRead = 0;
|
|
if (NS_FAILED(ReadFromFile(BlockIndexToOffset(aSourceBlockIndex),
|
|
buf,
|
|
BLOCK_SIZE,
|
|
bytesRead))) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
return WriteBlockToFile(aDestBlockIndex, buf);
|
|
}
|
|
|
|
nsresult FileBlockCache::Run()
|
|
{
|
|
MonitorAutoLock mon(mDataMonitor);
|
|
NS_ASSERTION(!NS_IsMainThread(), "Don't call on main thread");
|
|
NS_ASSERTION(!mChangeIndexList.IsEmpty(), "Only dispatch when there's work to do");
|
|
NS_ASSERTION(mIsWriteScheduled, "Should report write running or scheduled.");
|
|
|
|
while (!mChangeIndexList.IsEmpty()) {
|
|
if (!mIsOpen) {
|
|
// We've been closed, abort, discarding unwritten changes.
|
|
mIsWriteScheduled = false;
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
// Process each pending change. We pop the index out of the change
|
|
// list, but leave the BlockChange in mBlockChanges until the change
|
|
// is written to file. This is so that any read which happens while
|
|
// we drop mDataMonitor to write will refer to the data's source in
|
|
// memory, rather than the not-yet up to date data written to file.
|
|
// This also ensures we will insert a new index into mChangeIndexList
|
|
// when this happens.
|
|
|
|
// Hold a reference to the change, in case another change
|
|
// overwrites the mBlockChanges entry for this block while we drop
|
|
// mDataMonitor to take mFileMonitor.
|
|
int32_t blockIndex = mChangeIndexList.PopFront();
|
|
RefPtr<BlockChange> change = mBlockChanges[blockIndex];
|
|
MOZ_ASSERT(change,
|
|
"Change index list should only contain entries for blocks "
|
|
"with changes");
|
|
{
|
|
MonitorAutoUnlock unlock(mDataMonitor);
|
|
MonitorAutoLock lock(mFileMonitor);
|
|
if (change->IsWrite()) {
|
|
WriteBlockToFile(blockIndex, change->mData.get());
|
|
} else if (change->IsMove()) {
|
|
MoveBlockInFile(change->mSourceBlockIndex, blockIndex);
|
|
}
|
|
}
|
|
// If a new change has not been made to the block while we dropped
|
|
// mDataMonitor, clear reference to the old change. Otherwise, the old
|
|
// reference has been cleared already.
|
|
if (mBlockChanges[blockIndex] == change) {
|
|
mBlockChanges[blockIndex] = nullptr;
|
|
}
|
|
}
|
|
|
|
mIsWriteScheduled = false;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult FileBlockCache::Read(int64_t aOffset,
|
|
uint8_t* aData,
|
|
int32_t aLength,
|
|
int32_t* aBytes)
|
|
{
|
|
MonitorAutoLock mon(mDataMonitor);
|
|
|
|
if (!mFD || (aOffset / BLOCK_SIZE) > INT32_MAX)
|
|
return NS_ERROR_FAILURE;
|
|
|
|
int32_t bytesToRead = aLength;
|
|
int64_t offset = aOffset;
|
|
uint8_t* dst = aData;
|
|
while (bytesToRead > 0) {
|
|
int32_t blockIndex = static_cast<int32_t>(offset / BLOCK_SIZE);
|
|
int32_t start = offset % BLOCK_SIZE;
|
|
int32_t amount = std::min(BLOCK_SIZE - start, bytesToRead);
|
|
|
|
// If the block is not yet written to file, we can just read from
|
|
// the memory buffer, otherwise we need to read from file.
|
|
int32_t bytesRead = 0;
|
|
RefPtr<BlockChange> change = mBlockChanges[blockIndex];
|
|
if (change && change->IsWrite()) {
|
|
// Block isn't yet written to file. Read from memory buffer.
|
|
const uint8_t* blockData = change->mData.get();
|
|
memcpy(dst, blockData + start, amount);
|
|
bytesRead = amount;
|
|
} else {
|
|
if (change && change->IsMove()) {
|
|
// The target block is the destination of a not-yet-completed move
|
|
// action, so read from the move's source block from file. Note we
|
|
// *don't* follow a chain of moves here, as a move's source index
|
|
// is resolved when MoveBlock() is called, and the move's source's
|
|
// block could be have itself been subject to a move (or write)
|
|
// which happened *after* this move was recorded.
|
|
blockIndex = mBlockChanges[blockIndex]->mSourceBlockIndex;
|
|
}
|
|
// Block has been written to file, either as the source block of a move,
|
|
// or as a stable (all changes made) block. Read the data directly
|
|
// from file.
|
|
nsresult res;
|
|
{
|
|
MonitorAutoUnlock unlock(mDataMonitor);
|
|
MonitorAutoLock lock(mFileMonitor);
|
|
res = ReadFromFile(BlockIndexToOffset(blockIndex) + start,
|
|
dst,
|
|
amount,
|
|
bytesRead);
|
|
}
|
|
NS_ENSURE_SUCCESS(res,res);
|
|
}
|
|
dst += bytesRead;
|
|
offset += bytesRead;
|
|
bytesToRead -= bytesRead;
|
|
}
|
|
*aBytes = aLength - bytesToRead;
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult FileBlockCache::MoveBlock(int32_t aSourceBlockIndex, int32_t aDestBlockIndex)
|
|
{
|
|
NS_ASSERTION(NS_IsMainThread(), "Only call on main thread");
|
|
MonitorAutoLock mon(mDataMonitor);
|
|
|
|
if (!mIsOpen)
|
|
return NS_ERROR_FAILURE;
|
|
|
|
mBlockChanges.EnsureLengthAtLeast(std::max(aSourceBlockIndex, aDestBlockIndex) + 1);
|
|
|
|
// The source block's contents may be the destination of another pending
|
|
// move, which in turn can be the destination of another pending move,
|
|
// etc. Resolve the final source block, so that if one of the blocks in
|
|
// the chain of moves is overwritten, we don't lose the reference to the
|
|
// contents of the destination block.
|
|
int32_t sourceIndex = aSourceBlockIndex;
|
|
BlockChange* sourceBlock = nullptr;
|
|
while ((sourceBlock = mBlockChanges[sourceIndex]) &&
|
|
sourceBlock->IsMove()) {
|
|
sourceIndex = sourceBlock->mSourceBlockIndex;
|
|
}
|
|
|
|
if (mBlockChanges[aDestBlockIndex] == nullptr ||
|
|
!mChangeIndexList.Contains(aDestBlockIndex)) {
|
|
// Only add another entry to the change index list if we don't already
|
|
// have one for this block. We won't have an entry when either there's
|
|
// no pending change for this block, or if there is a pending change for
|
|
// this block and we're in the process of writing it (we've popped the
|
|
// block's index out of mChangeIndexList in Run() but not finished writing
|
|
// the block to file yet.
|
|
mChangeIndexList.PushBack(aDestBlockIndex);
|
|
}
|
|
|
|
// If the source block hasn't yet been written to file then the dest block
|
|
// simply contains that same write. Resolve this as a write instead.
|
|
if (sourceBlock && sourceBlock->IsWrite()) {
|
|
mBlockChanges[aDestBlockIndex] = new BlockChange(sourceBlock->mData.get());
|
|
} else {
|
|
mBlockChanges[aDestBlockIndex] = new BlockChange(sourceIndex);
|
|
}
|
|
|
|
EnsureWriteScheduled();
|
|
|
|
NS_ASSERTION(mChangeIndexList.Contains(aDestBlockIndex),
|
|
"Should have scheduled block for change");
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
} // End namespace mozilla.
|