Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-26 23:23:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1282026 - Add assertions in the DTOR of WorkerHolder - part 3 - PromiseWorkerProxy, r=bkelly

Browse Source
This commit is contained in:
Andrea Marchesini 2016-07-18 09:14:14 +02:00
parent 187fceb90b
commit 96a5167026
2 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
dom/promise/Promise.cpp
View File

@ -2930,6 +2930,29 @@ private:
PromiseWorkerProxy::RunCallbackFunc mFunc;
};
class PromiseWorkerHolder final : public WorkerHolder
{
// RawPointer because this proxy keeps alive the holder.
PromiseWorkerProxy* mProxy;
public:
explicit PromiseWorkerHolder(PromiseWorkerProxy* aProxy)
: mProxy(aProxy)
{
MOZ_ASSERT(aProxy);
}
bool
Notify(Status aStatus) override
{
if (aStatus >= Canceling) {
mProxy->CleanUp();
}
return true;
}
};
/* static */
already_AddRefed<PromiseWorkerProxy>
PromiseWorkerProxy::Create(WorkerPrivate* aWorkerPrivate,
@ -2966,16 +2989,13 @@ PromiseWorkerProxy::PromiseWorkerProxy(WorkerPrivate* aWorkerPrivate,
, mCleanedUp(false)
, mCallbacks(aCallbacks)
, mCleanUpLock("cleanUpLock")
#ifdef DEBUG
, mWorkerHolderAdded(false)
#endif
{
}
PromiseWorkerProxy::~PromiseWorkerProxy()
{
MOZ_ASSERT(mCleanedUp);
MOZ_ASSERT(!mWorkerHolderAdded);
MOZ_ASSERT(!mWorkerHolder);
MOZ_ASSERT(!mWorkerPromise);
MOZ_ASSERT(!mWorkerPrivate);
}
@ -3003,14 +3023,14 @@ PromiseWorkerProxy::AddRefObject()
{
MOZ_ASSERT(mWorkerPrivate);
mWorkerPrivate->AssertIsOnWorkerThread();
MOZ_ASSERT(!mWorkerHolderAdded);
if (NS_WARN_IF(!HoldWorker(mWorkerPrivate))) {
MOZ_ASSERT(!mWorkerHolder);
mWorkerHolder.reset(new PromiseWorkerHolder(this));
if (NS_WARN_IF(!mWorkerHolder->HoldWorker(mWorkerPrivate))) {
mWorkerHolder = nullptr;
return false;
}
#ifdef DEBUG
mWorkerHolderAdded = true;
#endif
// Maintain a reference so that we have a valid object to clean up when
// removing the feature.
AddRef();
@ -3028,7 +3048,7 @@ PromiseWorkerProxy::GetWorkerPrivate() const
// Safe to check this without a lock since we assert lock ownership on the
// main thread above.
MOZ_ASSERT(!mCleanedUp);
MOZ_ASSERT(mWorkerHolderAdded);
MOZ_ASSERT(mWorkerHolder);
return mWorkerPrivate;
}
@ -3094,16 +3114,6 @@ PromiseWorkerProxy::RejectedCallback(JSContext* aCx,
RunCallback(aCx, aValue, &Promise::MaybeReject);
}
bool
PromiseWorkerProxy::Notify(Status aStatus)
{
if (aStatus >= Canceling) {
CleanUp();
}
return true;
}
void
PromiseWorkerProxy::CleanUp()
{
@ -3121,14 +3131,12 @@ PromiseWorkerProxy::CleanUp()
MOZ_ASSERT(mWorkerPrivate);
mWorkerPrivate->AssertIsOnWorkerThread();
// Release the Promise and remove the PromiseWorkerProxy from the features of
// Release the Promise and remove the PromiseWorkerProxy from the holders of
// the worker thread since the Promise has been resolved/rejected or the
// worker thread has been cancelled.
MOZ_ASSERT(mWorkerHolderAdded);
ReleaseWorker();
#ifdef DEBUG
mWorkerHolderAdded = false;
#endif
MOZ_ASSERT(mWorkerHolder);
mWorkerHolder = nullptr;
CleanProperties();
}
Release();

8
dom/promise/PromiseWorkerProxy.h
View File

@ -110,7 +110,6 @@ class WorkerPrivate;
// references to it are dropped.
class PromiseWorkerProxy : public PromiseNativeHandler
, public workers::WorkerHolder
, public StructuredCloneHolderBase
{
friend class PromiseWorkerProxyRunnable;
@ -185,8 +184,6 @@ protected:
virtual void RejectedCallback(JSContext* aCx,
JS::Handle<JS::Value> aValue) override;
virtual bool Notify(workers::Status aStatus) override;
private:
PromiseWorkerProxy(workers::WorkerPrivate* aWorkerPrivate,
Promise* aWorkerPromise,
@ -227,10 +224,7 @@ private:
// Ensure the worker and the main thread won't race to access |mCleanedUp|.
Mutex mCleanUpLock;
#ifdef DEBUG
// Maybe get rid of this entirely and rely on mCleanedUp
bool mWorkerHolderAdded;
#endif
UniquePtr<workers::WorkerHolder> mWorkerHolder;
};
} // namespace dom
} // namespace mozilla