wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1194555 - Part 4: Rename GetReportsState PendingProcessesState. r=njn

Browse Source
This commit is contained in:
Eric Rahm 2015-10-14 16:52:57 -07:00
parent fca53ac609
commit 36f694bfa4
2 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
xpcom/base/nsMemoryReporterManager.cpp
View File

@ -1356,7 +1356,7 @@ nsMemoryReporterManager::nsMemoryReporterManager()
, mSavedStrongReporters(nullptr)
, mSavedWeakReporters(nullptr)
, mNextGeneration(1)
, mGetReportsState(nullptr)
, mPendingProcessesState(nullptr)
{
}
@ -1414,11 +1414,11 @@ nsMemoryReporterManager::GetReportsExtended(
uint32_t generation = mNextGeneration++;
if (mGetReportsState) {
if (mPendingProcessesState) {
// A request is in flight. Don't start another one. And don't report
// an error; just ignore it, and let the in-flight request finish.
MEMORY_REPORTING_LOG("GetReports (gen=%u, s->gen=%u): abort\n",
generation, mGetReportsState->mGeneration);
generation, mPendingProcessesState->mGeneration);
return NS_OK;
}
@ -1429,15 +1429,15 @@ nsMemoryReporterManager::GetReportsExtended(
if (concurrency < 1) {
concurrency = 1;
}
mGetReportsState = new GetReportsState(generation,
aAnonymize,
aMinimize,
concurrency,
aHandleReport,
aHandleReportData,
aFinishReporting,
aFinishReportingData,
aDMDDumpIdent);
mPendingProcessesState = new PendingProcessesState(generation,
aAnonymize,
aMinimize,
concurrency,
aHandleReport,
aHandleReportData,
aFinishReporting,
aFinishReportingData,
aDMDDumpIdent);
if (aMinimize) {
rv = MinimizeMemoryUsage(NS_NewRunnableMethod(
@ -1451,7 +1451,7 @@ nsMemoryReporterManager::GetReportsExtended(
nsresult
nsMemoryReporterManager::StartGettingReports()
{
GetReportsState* s = mGetReportsState;
PendingProcessesState* s = mPendingProcessesState;
nsresult rv;
// Get reports for this process.
@ -1552,13 +1552,13 @@ nsMemoryReporterManager::GetReportsForThisProcessExtended(
return NS_OK;
}
nsMemoryReporterManager::GetReportsState*
nsMemoryReporterManager::PendingProcessesState*
nsMemoryReporterManager::GetStateForGeneration(uint32_t aGeneration)
{
// Memory reporting only happens on the main thread.
MOZ_RELEASE_ASSERT(NS_IsMainThread());
GetReportsState* s = mGetReportsState;
PendingProcessesState* s = mPendingProcessesState;
if (!s) {
// If we reach here, then:
@ -1595,7 +1595,7 @@ nsMemoryReporterManager::HandleChildReport(
uint32_t aGeneration,
const dom::MemoryReport& aChildReport)
{
GetReportsState* s = GetStateForGeneration(aGeneration);
PendingProcessesState* s = GetStateForGeneration(aGeneration);
if (!s) {
return;
}
@ -1615,7 +1615,7 @@ nsMemoryReporterManager::HandleChildReport(
/* static */ bool
nsMemoryReporterManager::StartChildReport(mozilla::dom::ContentParent* aChild,
const GetReportsState* aState)
const PendingProcessesState* aState)
{
#ifdef MOZ_NUWA_PROCESS
if (aChild->IsNuwaProcess()) {
@ -1653,7 +1653,7 @@ nsMemoryReporterManager::StartChildReport(mozilla::dom::ContentParent* aChild,
void
nsMemoryReporterManager::EndProcessReport(uint32_t aGeneration, bool aSuccess)
{
GetReportsState* s = GetStateForGeneration(aGeneration);
PendingProcessesState* s = GetStateForGeneration(aGeneration);
if (!s) {
return;
}
@ -1700,12 +1700,12 @@ nsMemoryReporterManager::EndProcessReport(uint32_t aGeneration, bool aSuccess)
nsMemoryReporterManager::TimeoutCallback(nsITimer* aTimer, void* aData)
{
nsMemoryReporterManager* mgr = static_cast<nsMemoryReporterManager*>(aData);
GetReportsState* s = mgr->mGetReportsState;
PendingProcessesState* s = mgr->mPendingProcessesState;
// Release assert because: if the pointer is null we're about to
// crash regardless of DEBUG, and this way the compiler doesn't
// complain about unused variables.
MOZ_RELEASE_ASSERT(s, "mgr->mGetReportsState");
MOZ_RELEASE_ASSERT(s, "mgr->mPendingProcessesState");
MEMORY_REPORTING_LOG("TimeoutCallback (s->gen=%u; %u running, %u pending)\n",
s->mGeneration, s->mNumProcessesRunning,
static_cast<unsigned>(s->mChildrenPending.Length()));
@ -1723,23 +1723,23 @@ nsMemoryReporterManager::FinishReporting()
MOZ_CRASH();
}
MOZ_ASSERT(mGetReportsState);
MOZ_ASSERT(mPendingProcessesState);
MEMORY_REPORTING_LOG("FinishReporting (s->gen=%u; %u processes reported)\n",
mGetReportsState->mGeneration,
mGetReportsState->mNumProcessesCompleted);
mPendingProcessesState->mGeneration,
mPendingProcessesState->mNumProcessesCompleted);
// Call this before deleting |mGetReportsState|. That way, if
// Call this before deleting |mPendingProcessesState|. That way, if
// |mFinishReportData| calls GetReports(), it will silently abort, as
// required.
nsresult rv = mGetReportsState->mFinishReporting->Callback(
mGetReportsState->mFinishReportingData);
nsresult rv = mPendingProcessesState->mFinishReporting->Callback(
mPendingProcessesState->mFinishReportingData);
delete mGetReportsState;
mGetReportsState = nullptr;
delete mPendingProcessesState;
mPendingProcessesState = nullptr;
return rv;
}
nsMemoryReporterManager::GetReportsState::GetReportsState(
nsMemoryReporterManager::PendingProcessesState::PendingProcessesState(
uint32_t aGeneration, bool aAnonymize, bool aMinimize,
uint32_t aConcurrencyLimit,
nsIHandleReportCallback* aHandleReport,

26
xpcom/base/nsMemoryReporterManager.h
View File

@ -48,7 +48,7 @@ public:
//
// - GetReports() (declared within NS_DECL_NSIMEMORYREPORTERMANAGER)
// synchronously gets memory reports for the current process, sets up some
// state (mGetReportsState) for when child processes report back --
// state (mPendingProcessesState) for when child processes report back --
// including a timer -- and starts telling child processes to get memory
// reports. Control then returns to the main event loop.
//
@ -108,7 +108,7 @@ public:
// is incomplete.
//
// Now, what what happens if a child process is created/destroyed in the
// middle of a request? Well, GetReportsState is initialized with an array
// middle of a request? Well, PendingProcessesState is initialized with an array
// of child process actors as of when the report started. So...
//
// - If a process is created after reporting starts, it won't be sent a
@ -205,7 +205,7 @@ private:
uint32_t mNextGeneration;
struct GetReportsState
struct PendingProcessesState
{
uint32_t mGeneration;
bool mAnonymize;
@ -221,23 +221,23 @@ private:
nsCOMPtr<nsISupports> mFinishReportingData;
nsString mDMDDumpIdent;
GetReportsState(uint32_t aGeneration, bool aAnonymize, bool aMinimize,
uint32_t aConcurrencyLimit,
nsIHandleReportCallback* aHandleReport,
nsISupports* aHandleReportData,
nsIFinishReportingCallback* aFinishReporting,
nsISupports* aFinishReportingData,
const nsAString& aDMDDumpIdent);
PendingProcessesState(uint32_t aGeneration, bool aAnonymize, bool aMinimize,
uint32_t aConcurrencyLimit,
nsIHandleReportCallback* aHandleReport,
nsISupports* aHandleReportData,
nsIFinishReportingCallback* aFinishReporting,
nsISupports* aFinishReportingData,
const nsAString& aDMDDumpIdent);
};
// When this is non-null, a request is in flight. Note: We use manual
// new/delete for this because its lifetime doesn't match block scope or
// anything like that.
GetReportsState* mGetReportsState;
PendingProcessesState* mPendingProcessesState;
GetReportsState* GetStateForGeneration(uint32_t aGeneration);
PendingProcessesState* GetStateForGeneration(uint32_t aGeneration);
static bool StartChildReport(mozilla::dom::ContentParent* aChild,
const GetReportsState* aState);
const PendingProcessesState* aState);
};
#define NS_MEMORY_REPORTER_MANAGER_CID \