mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
18ad48cb0e
- Bug 1217835 - Rewrite some code in CanvasRenderingContext2D::GetImageDataArray to avoid build warnings; r=gw280 (cedba0b14a) - Bug 1232864 - Cauterize and release WebGL 2 to Nightly. - r=jrmuizel (5a16387f1d) - Bug 1229585 - Add helpful error text for fb incompleteness. - r=kamidphish (1a3d7505e2) - Bug 1231303 - Moz2Dify nsFilterInstance. r=roc. (44ec4c5df6) - Bug 1229235 - Make RedirectChannelRegistrar thread-safe. r=jduell (5acca6a770) - Bug 1211090 - Use Buffered IO for PrefixSet load/store. r=froydnj (00720fe291) - Bug 1211090 - Add fallocate support to nsIOutputFileStream and use it. r=froydnj (6a49aa4a5f) - Bug 1211090 - Don't fail to open databases if we can't do buffered IO. r=froydnj (70ab38e03b) - Bug 1223808 - part 3 - replace nsAutoArrayPtr<T> with UniquePtr<T[]> in netwerk/; r=mcmanus (4a1d880135) - Bug 1223808 - part 1 - optimize creating a WebSocketFrame with a payload; r=mcmanus (9a046a6f0a) - Bug 1223808 - part 2 - use UniquePtr<uint8_t[]> instead of nsAutoArrayPtr<SHA1Sum::Hash> in HandleHashKey; r=michal (c6a0f6d5d3) - Bug 1167053 - Convert NetUtil.newChannel2 callsites to use new API - remove newChannel2,asyncFetch2 (r=sicking,paolo) (875b9c78f0) - Bug 1185982 - Remove the unused NotifyNetworkActivity::mObs member; r=bagder (f09d2676f7) - bits of Bug 1152597 - Icons are shown for some apps. (9a289ab9ec) - Bug 1223231 - Use channel.asyncOpen2 in devtools/client/shared/AppCacheUtils.jsm (r=sicking) (5c635d797c) - Bug 1208905 - Fix a condition in PresentationResponderLoadingCallback::Init; r=baku (ff84b8a595) - Bug 1231677 - verify the return of mDiscoveryTimer->Init, if it faild exit function with error code. r=jst (04b8be172c) - Bug 1199564 - start/stop mDNS on demand - v3. r=mcmanus (66d7ef06e6) - Bug 1225726 - enable nsDNSServiceDiscovery on OS X. r=mcmanus. (01ea13e4a6) - Bug 1172383 - Stop mDNS properly during destruction. r=mcmanus (c041817b7e) - Bug 1198058 - Fix crashes inspecting loadGroups in browser toolbox. r=mcmanus (462b5aa8bd) - Bug 1220607 - Expand on the nsILoadGroup interface's comment to indicate how it is used. r=bz IGNORE IDL (49a95cc217) - use response for response (348055fc69) - Remove some old clobber-workarounds. No bug. (db7e7c4773) - Bug 280280 - Make "no proxy for" do domain comparison. r=bagder (4804e39fd6) - backout f600f0cd7bb3 (Bug 1170646) because of Thunderbird regressions with OSX, r=michal (d43ba00896) - Bug 1220215 - Add '#' between client id and suffix in appcache groud id, r=jduell (240fcec72a) - Bug 1198792 - Clear Application Cache internal hashtables on Clear Recent History, r=jduell (1313393dc5) - Bug 1222782 - TSan: data race netwerk/cache2/CacheIOThread.cpp:148 Target (race on mXPCOMThread), r=jseward (d56470a300) - Bug 1190951 - TSan: data race netwerk/cache2/CacheIndex.cpp:1397 CacheIndex::IsUpToDate, r=valentin.gosu (24934e1885)
361 lines
8.6 KiB
C++
361 lines
8.6 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 "CacheIOThread.h"
|
|
#include "CacheFileIOManager.h"
|
|
|
|
#include "nsIRunnable.h"
|
|
#include "nsISupportsImpl.h"
|
|
#include "nsPrintfCString.h"
|
|
#include "nsThreadUtils.h"
|
|
#include "mozilla/IOInterposer.h"
|
|
|
|
namespace mozilla {
|
|
namespace net {
|
|
|
|
CacheIOThread* CacheIOThread::sSelf = nullptr;
|
|
|
|
NS_IMPL_ISUPPORTS(CacheIOThread, nsIThreadObserver)
|
|
|
|
CacheIOThread::CacheIOThread()
|
|
: mMonitor("CacheIOThread")
|
|
, mThread(nullptr)
|
|
, mXPCOMThread(nullptr)
|
|
, mLowestLevelWaiting(LAST_LEVEL)
|
|
, mCurrentlyExecutingLevel(0)
|
|
, mHasXPCOMEvents(false)
|
|
, mRerunCurrentEvent(false)
|
|
, mShutdown(false)
|
|
, mInsideLoop(true)
|
|
{
|
|
sSelf = this;
|
|
}
|
|
|
|
CacheIOThread::~CacheIOThread()
|
|
{
|
|
if (mXPCOMThread) {
|
|
nsIThread *thread = mXPCOMThread;
|
|
thread->Release();
|
|
}
|
|
|
|
sSelf = nullptr;
|
|
#ifdef DEBUG
|
|
for (uint32_t level = 0; level < LAST_LEVEL; ++level) {
|
|
MOZ_ASSERT(!mEventQueue[level].Length());
|
|
}
|
|
#endif
|
|
}
|
|
|
|
nsresult CacheIOThread::Init()
|
|
{
|
|
mThread = PR_CreateThread(PR_USER_THREAD, ThreadFunc, this,
|
|
PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
|
|
PR_JOINABLE_THREAD, 128 * 1024);
|
|
if (!mThread)
|
|
return NS_ERROR_FAILURE;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult CacheIOThread::Dispatch(nsIRunnable* aRunnable, uint32_t aLevel)
|
|
{
|
|
NS_ENSURE_ARG(aLevel < LAST_LEVEL);
|
|
|
|
// Runnable is always expected to be non-null, hard null-check bellow.
|
|
MOZ_ASSERT(aRunnable);
|
|
|
|
MonitorAutoLock lock(mMonitor);
|
|
|
|
if (mShutdown && (PR_GetCurrentThread() != mThread))
|
|
return NS_ERROR_UNEXPECTED;
|
|
|
|
return DispatchInternal(aRunnable, aLevel);
|
|
}
|
|
|
|
nsresult CacheIOThread::DispatchAfterPendingOpens(nsIRunnable* aRunnable)
|
|
{
|
|
// Runnable is always expected to be non-null, hard null-check bellow.
|
|
MOZ_ASSERT(aRunnable);
|
|
|
|
MonitorAutoLock lock(mMonitor);
|
|
|
|
if (mShutdown && (PR_GetCurrentThread() != mThread))
|
|
return NS_ERROR_UNEXPECTED;
|
|
|
|
// Move everything from later executed OPEN level to the OPEN_PRIORITY level
|
|
// where we post the (eviction) runnable.
|
|
mEventQueue[OPEN_PRIORITY].AppendElements(mEventQueue[OPEN]);
|
|
mEventQueue[OPEN].Clear();
|
|
|
|
return DispatchInternal(aRunnable, OPEN_PRIORITY);
|
|
}
|
|
|
|
nsresult CacheIOThread::DispatchInternal(nsIRunnable* aRunnable, uint32_t aLevel)
|
|
{
|
|
if (NS_WARN_IF(!aRunnable))
|
|
return NS_ERROR_NULL_POINTER;
|
|
|
|
mMonitor.AssertCurrentThreadOwns();
|
|
|
|
mEventQueue[aLevel].AppendElement(aRunnable);
|
|
if (mLowestLevelWaiting > aLevel)
|
|
mLowestLevelWaiting = aLevel;
|
|
|
|
mMonitor.NotifyAll();
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
bool CacheIOThread::IsCurrentThread()
|
|
{
|
|
return mThread == PR_GetCurrentThread();
|
|
}
|
|
|
|
bool CacheIOThread::YieldInternal()
|
|
{
|
|
if (!IsCurrentThread()) {
|
|
NS_WARNING("Trying to yield to priority events on non-cache2 I/O thread? "
|
|
"You probably do something wrong.");
|
|
return false;
|
|
}
|
|
|
|
if (mCurrentlyExecutingLevel == XPCOM_LEVEL) {
|
|
// Doesn't make any sense, since this handler is the one
|
|
// that would be executed as the next one.
|
|
return false;
|
|
}
|
|
|
|
if (!EventsPending(mCurrentlyExecutingLevel))
|
|
return false;
|
|
|
|
mRerunCurrentEvent = true;
|
|
return true;
|
|
}
|
|
|
|
nsresult CacheIOThread::Shutdown()
|
|
{
|
|
{
|
|
MonitorAutoLock lock(mMonitor);
|
|
mShutdown = true;
|
|
mMonitor.NotifyAll();
|
|
}
|
|
|
|
PR_JoinThread(mThread);
|
|
mThread = nullptr;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
already_AddRefed<nsIEventTarget> CacheIOThread::Target()
|
|
{
|
|
nsCOMPtr<nsIEventTarget> target;
|
|
|
|
target = mXPCOMThread;
|
|
if (!target && mThread)
|
|
{
|
|
MonitorAutoLock lock(mMonitor);
|
|
if (!mXPCOMThread)
|
|
lock.Wait();
|
|
|
|
target = mXPCOMThread;
|
|
}
|
|
|
|
return target.forget();
|
|
}
|
|
|
|
// static
|
|
void CacheIOThread::ThreadFunc(void* aClosure)
|
|
{
|
|
PR_SetCurrentThreadName("Cache2 I/O");
|
|
mozilla::IOInterposer::RegisterCurrentThread();
|
|
CacheIOThread* thread = static_cast<CacheIOThread*>(aClosure);
|
|
thread->ThreadFunc();
|
|
mozilla::IOInterposer::UnregisterCurrentThread();
|
|
}
|
|
|
|
void CacheIOThread::ThreadFunc()
|
|
{
|
|
nsCOMPtr<nsIThreadInternal> threadInternal;
|
|
|
|
{
|
|
MonitorAutoLock lock(mMonitor);
|
|
|
|
// This creates nsThread for this PRThread
|
|
nsCOMPtr<nsIThread> xpcomThread = NS_GetCurrentThread();
|
|
|
|
threadInternal = do_QueryInterface(xpcomThread);
|
|
if (threadInternal)
|
|
threadInternal->SetObserver(this);
|
|
|
|
mXPCOMThread = xpcomThread.forget().take();
|
|
|
|
lock.NotifyAll();
|
|
|
|
do {
|
|
loopStart:
|
|
// Reset the lowest level now, so that we can detect a new event on
|
|
// a lower level (i.e. higher priority) has been scheduled while
|
|
// executing any previously scheduled event.
|
|
mLowestLevelWaiting = LAST_LEVEL;
|
|
|
|
// Process xpcom events first
|
|
while (mHasXPCOMEvents) {
|
|
mHasXPCOMEvents = false;
|
|
mCurrentlyExecutingLevel = XPCOM_LEVEL;
|
|
|
|
MonitorAutoUnlock unlock(mMonitor);
|
|
|
|
bool processedEvent;
|
|
nsresult rv;
|
|
do {
|
|
nsIThread *thread = mXPCOMThread;
|
|
rv = thread->ProcessNextEvent(false, &processedEvent);
|
|
} while (NS_SUCCEEDED(rv) && processedEvent);
|
|
}
|
|
|
|
uint32_t level;
|
|
for (level = 0; level < LAST_LEVEL; ++level) {
|
|
if (!mEventQueue[level].Length()) {
|
|
// no events on this level, go to the next level
|
|
continue;
|
|
}
|
|
|
|
LoopOneLevel(level);
|
|
|
|
// Go to the first (lowest) level again
|
|
goto loopStart;
|
|
}
|
|
|
|
if (EventsPending())
|
|
continue;
|
|
|
|
if (mShutdown)
|
|
break;
|
|
|
|
lock.Wait(PR_INTERVAL_NO_TIMEOUT);
|
|
|
|
if (EventsPending())
|
|
continue;
|
|
|
|
} while (true);
|
|
|
|
MOZ_ASSERT(!EventsPending());
|
|
|
|
// This is for correct assertion on XPCOM events dispatch.
|
|
mInsideLoop = false;
|
|
} // lock
|
|
|
|
if (threadInternal)
|
|
threadInternal->SetObserver(nullptr);
|
|
}
|
|
|
|
static const char* const sLevelTraceName[] = {
|
|
"net::cache::io::level(0)",
|
|
"net::cache::io::level(1)",
|
|
"net::cache::io::level(2)",
|
|
"net::cache::io::level(3)",
|
|
"net::cache::io::level(4)",
|
|
"net::cache::io::level(5)",
|
|
"net::cache::io::level(6)",
|
|
"net::cache::io::level(7)",
|
|
"net::cache::io::level(8)",
|
|
"net::cache::io::level(9)",
|
|
"net::cache::io::level(10)",
|
|
"net::cache::io::level(11)",
|
|
"net::cache::io::level(12)"
|
|
};
|
|
|
|
void CacheIOThread::LoopOneLevel(uint32_t aLevel)
|
|
{
|
|
nsTArray<nsCOMPtr<nsIRunnable> > events;
|
|
events.SwapElements(mEventQueue[aLevel]);
|
|
uint32_t length = events.Length();
|
|
|
|
mCurrentlyExecutingLevel = aLevel;
|
|
|
|
bool returnEvents = false;
|
|
uint32_t index;
|
|
{
|
|
MonitorAutoUnlock unlock(mMonitor);
|
|
|
|
for (index = 0; index < length; ++index) {
|
|
if (EventsPending(aLevel)) {
|
|
// Somebody scheduled a new event on a lower level, break and harry
|
|
// to execute it! Don't forget to return what we haven't exec.
|
|
returnEvents = true;
|
|
break;
|
|
}
|
|
|
|
// Drop any previous flagging, only an event on the current level may set
|
|
// this flag.
|
|
mRerunCurrentEvent = false;
|
|
|
|
events[index]->Run();
|
|
|
|
if (mRerunCurrentEvent) {
|
|
// The event handler yields to higher priority events and wants to rerun.
|
|
returnEvents = true;
|
|
break;
|
|
}
|
|
|
|
// Release outside the lock.
|
|
events[index] = nullptr;
|
|
}
|
|
}
|
|
|
|
if (returnEvents)
|
|
mEventQueue[aLevel].InsertElementsAt(0, events.Elements() + index, length - index);
|
|
}
|
|
|
|
bool CacheIOThread::EventsPending(uint32_t aLastLevel)
|
|
{
|
|
return mLowestLevelWaiting < aLastLevel || mHasXPCOMEvents;
|
|
}
|
|
|
|
NS_IMETHODIMP CacheIOThread::OnDispatchedEvent(nsIThreadInternal *thread)
|
|
{
|
|
MonitorAutoLock lock(mMonitor);
|
|
mHasXPCOMEvents = true;
|
|
MOZ_ASSERT(mInsideLoop);
|
|
lock.Notify();
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP CacheIOThread::OnProcessNextEvent(nsIThreadInternal *thread, bool mayWait)
|
|
{
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP CacheIOThread::AfterProcessNextEvent(nsIThreadInternal *thread,
|
|
bool eventWasProcessed)
|
|
{
|
|
return NS_OK;
|
|
}
|
|
|
|
// Memory reporting
|
|
|
|
size_t CacheIOThread::SizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf) const
|
|
{
|
|
MonitorAutoLock lock(const_cast<CacheIOThread*>(this)->mMonitor);
|
|
|
|
size_t n = 0;
|
|
n += mallocSizeOf(mThread);
|
|
for (uint32_t level = 0; level < LAST_LEVEL; ++level) {
|
|
n += mEventQueue[level].ShallowSizeOfExcludingThis(mallocSizeOf);
|
|
// Events referenced by the queues are arbitrary objects we cannot be sure
|
|
// are reported elsewhere as well as probably not implementing nsISizeOf
|
|
// interface. Deliberatly omitting them from reporting here.
|
|
}
|
|
|
|
return n;
|
|
}
|
|
|
|
size_t CacheIOThread::SizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf) const
|
|
{
|
|
return mallocSizeOf(this) + SizeOfExcludingThis(mallocSizeOf);
|
|
}
|
|
|
|
} // namespace net
|
|
} // namespace mozilla
|