Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 05:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1049068 - Part 3: Remove mCallContext from ResourceAcquisition. r=froydnj

Browse Source 
--HG--
extra : rebase_source : 5b1c0e5b0d0e722af8ca496240e4bc5e080edae6
This commit is contained in:
Eric Rahm 2014-08-08 11:43:38 -07:00
parent 0f271b4889
commit 6194496e1f
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
xpcom/glue/DeadlockDetector.h
View File

@ -140,23 +140,18 @@ public:
struct ResourceAcquisition
{
const T* mResource;
CallStack mCallContext;
explicit ResourceAcquisition(const T* aResource,
const CallStack aCallContext = CallStack::kNone)
explicit ResourceAcquisition(const T* aResource)
: mResource(aResource)
, mCallContext(aCallContext)
{
}
ResourceAcquisition(const ResourceAcquisition& aFrom)
: mResource(aFrom.mResource)
, mCallContext(aFrom.mCallContext)
{
}
ResourceAcquisition& operator=(const ResourceAcquisition& aFrom)
{
mResource = aFrom.mResource;
mCallContext = aFrom.mCallContext;
return *this;
}
};
@ -356,10 +351,8 @@ public:
if (!cycle) {
NS_RUNTIMEABORT("can't allocate dep. cycle array");
}
cycle->AppendElement(ResourceAcquisition(current->mResource,
current->mFirstSeen));
cycle->AppendElement(ResourceAcquisition(aProposed,
aCallContext));
cycle->AppendElement(ResourceAcquisition(current->mResource));
cycle->AppendElement(ResourceAcquisition(aProposed));
return cycle;
}
if (InTransitiveClosure(current, proposed)) {
@ -374,8 +367,7 @@ public:
// right conditions.
ResourceAcquisitionArray* cycle = GetDeductionChain(proposed, current);
// show how acquiring |aProposed| would complete the cycle
cycle->AppendElement(ResourceAcquisition(aProposed,
aCallContext));
cycle->AppendElement(ResourceAcquisition(aProposed));
return cycle;
}
// |aLast|, |aProposed| are unordered according to our
@ -435,8 +427,7 @@ public:
if (!chain) {
NS_RUNTIMEABORT("can't allocate dep. cycle array");
}
chain->AppendElement(ResourceAcquisition(aStart->mResource,
aStart->mFirstSeen));
chain->AppendElement(ResourceAcquisition(aStart->mResource));
NS_ASSERTION(GetDeductionChain_Helper(aStart, aTarget, chain),
"GetDeductionChain called when there's no deadlock");
@ -450,16 +441,14 @@ public:
ResourceAcquisitionArray* aChain)
{
if (aStart->mOrderedLT.BinaryIndexOf(aTarget) != NoIndex) {
aChain->AppendElement(ResourceAcquisition(aTarget->mResource,
aTarget->mFirstSeen));
aChain->AppendElement(ResourceAcquisition(aTarget->mResource));
return true;
}
index_type i = 0;
size_type len = aStart->mOrderedLT.Length();
for (const OrderingEntry* const* it = aStart->mOrderedLT.Elements(); i < len; ++i, ++it) {
aChain->AppendElement(ResourceAcquisition((*it)->mResource,
(*it)->mFirstSeen));
aChain->AppendElement(ResourceAcquisition((*it)->mResource));
if (GetDeductionChain_Helper(*it, aTarget, aChain)) {
return true;
}