Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge mozilla-central to fx-team on a CLOSED TREE

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2015-05-08 13:27:09 +02:00
commit 2646447b86
15 changed files with 200 additions and 411 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
dom/ipc/ContentParent.cpp
View File

@ -424,7 +424,7 @@ public:
private:
const uint32_t mGeneration;
// Non-null if we haven't yet called EndProcessReport() on it.
// Non-null if we haven't yet called EndChildReport() on it.
nsRefPtr<nsMemoryReporterManager> mReporterManager;
ContentParent* Owner()
@ -464,7 +464,7 @@ void
MemoryReportRequestParent::ActorDestroy(ActorDestroyReason aWhy)
{
if (mReporterManager) {
mReporterManager->EndProcessReport(mGeneration, aWhy == Deletion);
mReporterManager->EndChildReport(mGeneration, aWhy == Deletion);
mReporterManager = nullptr;
}
}
@ -648,6 +648,7 @@ static const char* sObserverTopics[] = {
"profile-before-change",
NS_IPC_IOSERVICE_SET_OFFLINE_TOPIC,
NS_IPC_IOSERVICE_SET_CONNECTIVITY_TOPIC,
"child-memory-reporter-request",
"memory-pressure",
"child-gc-request",
"child-cc-request",
@ -1975,6 +1976,18 @@ ContentParent::ActorDestroy(ActorDestroyReason why)
}
}
// Tell the memory reporter manager that this ContentParent is going away.
nsRefPtr<nsMemoryReporterManager> mgr =
nsMemoryReporterManager::GetOrCreate();
#ifdef MOZ_NUWA_PROCESS
bool isMemoryChild = !IsNuwaProcess();
#else
bool isMemoryChild = true;
#endif
if (mgr && isMemoryChild) {
mgr->DecrementNumChildProcesses();
}
// remove the global remote preferences observers
Preferences::RemoveObserver(this, "");
@ -2248,6 +2261,15 @@ ContentParent::ContentParent(mozIApplication* aApp,
IToplevelProtocol::SetTransport(mSubprocess->GetChannel());
if (!aIsNuwaProcess) {
// Tell the memory reporter manager that this ContentParent exists.
nsRefPtr<nsMemoryReporterManager> mgr =
nsMemoryReporterManager::GetOrCreate();
if (mgr) {
mgr->IncrementNumChildProcesses();
}
}
std::vector<std::string> extraArgs;
if (aIsNuwaProcess) {
extraArgs.push_back("-nuwa");
@ -2312,6 +2334,13 @@ ContentParent::ContentParent(ContentParent* aTemplate,
aPid,
*fd);
// Tell the memory reporter manager that this ContentParent exists.
nsRefPtr<nsMemoryReporterManager> mgr =
nsMemoryReporterManager::GetOrCreate();
if (mgr) {
mgr->IncrementNumChildProcesses();
}
mSubprocess->LaunchAndWaitForProcessHandle();
// Clone actors routed by aTemplate for this instance.
@ -3033,6 +3062,46 @@ ContentParent::Observe(nsISupports* aSubject,
nsDependentString(aData)))
return NS_ERROR_NOT_AVAILABLE;
}
else if (!strcmp(aTopic, "child-memory-reporter-request")) {
bool isNuwa = false;
#ifdef MOZ_NUWA_PROCESS
isNuwa = IsNuwaProcess();
#endif
if (!isNuwa) {
unsigned generation;
int anonymize, minimize, identOffset = -1;
nsDependentString msg(aData);
NS_ConvertUTF16toUTF8 cmsg(msg);
if (sscanf(cmsg.get(),
"generation=%x anonymize=%d minimize=%d DMDident=%n",
&generation, &anonymize, &minimize, &identOffset) < 3
|| identOffset < 0) {
return NS_ERROR_INVALID_ARG;
}
// The pre-%n part of the string should be all ASCII, so the byte
// offset in identOffset should be correct as a char offset.
MOZ_ASSERT(cmsg[identOffset - 1] == '=');
MaybeFileDesc dmdFileDesc = void_t();
#ifdef MOZ_DMD
nsAutoString dmdIdent(Substring(msg, identOffset));
if (!dmdIdent.IsEmpty()) {
FILE *dmdFile = nullptr;
nsresult rv = nsMemoryInfoDumper::OpenDMDFile(dmdIdent, Pid(), &dmdFile);
if (NS_WARN_IF(NS_FAILED(rv))) {
// Proceed with the memory report as if DMD were disabled.
dmdFile = nullptr;
}
if (dmdFile) {
dmdFileDesc = FILEToFileDescriptor(dmdFile);
fclose(dmdFile);
}
}
#endif
unused << SendPMemoryReportRequestConstructor(
generation, anonymize, minimize, dmdFileDesc);
}
}
else if (!strcmp(aTopic, "child-gc-request")){
unused << SendGarbageCollect();
}

14
media/webrtc/trunk/webrtc/modules/video_coding/main/source/jitter_buffer.cc
View File

@ -643,14 +643,12 @@ VCMFrameBufferEnum VCMJitterBuffer::GetFrame(const VCMPacket& packet,
// slices of the same lower-case frame (timestamp), the more complete
// solution for FindFrame that uses the seqNum and can move packets
// between sessions would be needed.
if (packet.completeNALU != kNaluComplete) {
*frame = incomplete_frames_.FindFrame(packet.seqNum, packet.timestamp);
if (*frame)
return kNoError;
*frame = decodable_frames_.FindFrame(packet.seqNum, packet.timestamp);
if (*frame && (*frame)->GetState() != kStateComplete)
return kNoError;
}
*frame = incomplete_frames_.FindFrame(packet.seqNum, packet.timestamp);
if (*frame)
return kNoError;
*frame = decodable_frames_.FindFrame(packet.seqNum, packet.timestamp);
if (*frame && (*frame)->GetState() != kStateComplete)
return kNoError;
// No match, return empty frame.
*frame = GetEmptyFrame();

12
mobile/android/base/BrowserApp.java
View File

@ -2632,16 +2632,6 @@ public class BrowserApp extends GeckoApp
fm.beginTransaction().add(R.id.search_container, mBrowserSearch, BROWSER_SEARCH_TAG).commitAllowingStateLoss();
mBrowserSearch.setUserVisibleHint(true);
// We want to adjust the window size when the keyboard appears to bring the
// SearchEngineBar above the keyboard. However, adjusting the window size
// when hiding the keyboard results in graphical glitches where the keyboard was
// because nothing was being drawn underneath (bug 933422). This can be
// prevented drawing content under the keyboard (i.e. in the Window).
//
// We do this here because there are glitches when unlocking a device with
// BrowserSearch in the foreground if we use BrowserSearch.onStart/Stop.
getActivity().getWindow().setBackgroundDrawableResource(android.R.color.white);
}
private void hideBrowserSearch() {
@ -2658,8 +2648,6 @@ public class BrowserApp extends GeckoApp
getSupportFragmentManager().beginTransaction()
.remove(mBrowserSearch).commitAllowingStateLoss();
mBrowserSearch.setUserVisibleHint(false);
getWindow().setBackgroundDrawable(null);
}
/**

43
mobile/android/base/home/BrowserSearch.java
View File

@ -65,8 +65,7 @@ import android.widget.TextView;
* Fragment that displays frecency search results in a ListView.
*/
public class BrowserSearch extends HomeFragment
implements GeckoEventListener,
SearchEngineBar.OnSearchBarClickListener {
implements GeckoEventListener {
@RobocopTarget
public interface SuggestClientFactory {
@ -125,9 +124,6 @@ public class BrowserSearch extends HomeFragment
// The list showing search results
private HomeListView mList;
// The bar on the bottom of the screen displaying search engine options.
private SearchEngineBar mSearchEngineBar;
// Client that performs search suggestion queries.
// Public for testing.
@RobocopTarget
@ -230,6 +226,23 @@ public class BrowserSearch extends HomeFragment
mSearchEngines = null;
}
@Override
public void onStart() {
super.onStart();
// Adjusting the window size when showing the keyboard results in the underlying
// activity being painted when the keyboard is hidden (bug 933422). This can be
// prevented by not resizing the window.
getActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING);
}
@Override
public void onStop() {
super.onStop();
getActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
}
@Override
public void onResume() {
super.onResume();
@ -255,7 +268,6 @@ public class BrowserSearch extends HomeFragment
// If the style of the list changes, inflate it from an XML.
mView = (LinearLayout) inflater.inflate(R.layout.browser_search, container, false);
mList = (HomeListView) mView.findViewById(R.id.home_list_view);
mSearchEngineBar = (SearchEngineBar) mView.findViewById(R.id.search_engine_bar);
return mView;
}
@ -267,9 +279,6 @@ public class BrowserSearch extends HomeFragment
EventDispatcher.getInstance().unregisterGeckoThreadListener(this,
"SearchEngines:Data");
mSearchEngineBar.setAdapter(null);
mSearchEngineBar = null;
mList.setAdapter(null);
mList = null;
@ -341,12 +350,6 @@ public class BrowserSearch extends HomeFragment
registerForContextMenu(mList);
EventDispatcher.getInstance().registerGeckoThreadListener(this,
"SearchEngines:Data");
// If the view backed by this Fragment is being recreated, we will not receive
// a new search engine data event so refresh the new search engine bar's data
// & Views with the data we have.
mSearchEngineBar.setSearchEngines(mSearchEngines);
mSearchEngineBar.setOnSearchBarClickListener(this);
}
@Override
@ -584,8 +587,6 @@ public class BrowserSearch extends HomeFragment
mAdapter.notifyDataSetChanged();
}
mSearchEngineBar.setSearchEngines(mSearchEngines);
// Show suggestions opt-in prompt only if suggestions are not enabled yet,
// user hasn't been prompted and we're not on a private browsing tab.
if (!mSuggestionsEnabled && !suggestionsPrompted && mSuggestClient != null) {
@ -598,14 +599,6 @@ public class BrowserSearch extends HomeFragment
filterSuggestions();
}
@Override
public void onSearchBarClickListener(final SearchEngine searchEngine) {
Telemetry.sendUIEvent(TelemetryContract.Event.LOAD_URL, TelemetryContract.Method.LIST_ITEM,
"searchenginebar");
mSearchListener.onSearch(searchEngine, mSearchTerm);
}
private void maybeSetSuggestClient(final String suggestTemplate, final boolean isPrivate) {
if (mSuggestClient != null || isPrivate) {
return;

137
mobile/android/base/home/SearchEngineBar.java
View File

@ -1,137 +0,0 @@
/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
/* 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/. */
package org.mozilla.gecko.home;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.BaseAdapter;
import android.widget.FrameLayout;
import org.mozilla.gecko.R;
import org.mozilla.gecko.widget.FaviconView;
import org.mozilla.gecko.widget.TwoWayView;
import java.util.ArrayList;
import java.util.List;
public class SearchEngineBar extends TwoWayView
implements AdapterView.OnItemClickListener {
private static final String LOGTAG = "Gecko" + SearchEngineBar.class.getSimpleName();
public interface OnSearchBarClickListener {
public void onSearchBarClickListener(SearchEngine searchEngine);
}
private final SearchEngineAdapter adapter;
private OnSearchBarClickListener onSearchBarClickListener;
public SearchEngineBar(final Context context, final AttributeSet attrs) {
super(context, attrs);
adapter = new SearchEngineAdapter();
setAdapter(adapter);
setOnItemClickListener(this);
}
@Override
public void onItemClick(final AdapterView<?> parent, final View view, final int position,
final long id) {
if (onSearchBarClickListener == null) {
throw new IllegalStateException(
OnSearchBarClickListener.class.getSimpleName() + " is not initialized");
}
final SearchEngine searchEngine = adapter.getItem(position);
onSearchBarClickListener.onSearchBarClickListener(searchEngine);
}
protected void setOnSearchBarClickListener(final OnSearchBarClickListener listener) {
onSearchBarClickListener = listener;
}
protected void setSearchEngines(final List<SearchEngine> searchEngines) {
adapter.setSearchEngines(searchEngines);
}
public class SearchEngineAdapter extends BaseAdapter {
List<SearchEngine> searchEngines = new ArrayList<>();
public void setSearchEngines(final List<SearchEngine> searchEngines) {
this.searchEngines = searchEngines;
notifyDataSetChanged();
}
@Override
public int getCount() {
return searchEngines.size();
}
@Override
public SearchEngine getItem(final int position) {
return searchEngines.get(position);
}
@Override
public long getItemId(final int position) {
return position;
}
@Override
public View getView(final int position, final View convertView, final ViewGroup parent) {
final View view;
if (convertView == null) {
view = LayoutInflater.from(getContext()).inflate(R.layout.search_engine_bar_item, parent, false);
} else {
view = convertView;
}
final FaviconView faviconView = (FaviconView) view.findViewById(R.id.search_engine_icon);
final SearchEngine searchEngine = searchEngines.get(position);
faviconView.updateAndScaleImage(searchEngine.getIcon(), searchEngine.getEngineIdentifier());
final View container = view.findViewById(R.id.search_engine_icon_container);
final String desc = getResources().getString(R.string.search_bar_item_desc, searchEngine.getEngineIdentifier());
container.setContentDescription(desc);
return view;
}
}
/**
* A Container to surround the SearchEngineBar. This is necessary so we can draw
* a divider across the entire width of the screen, but have the inner list layout
* not take up the full width of the screen so it can be centered within this container
* if there aren't enough items that it needs to scroll.
*
* Note: a better implementation would have this View inflating an inner layout so
* the containing layout doesn't need two "SearchEngineBar" Views but it wasn't
* worth the refactor time.
*/
@SuppressWarnings("unused") // via XML
public static class SearchEngineBarContainer extends FrameLayout {
private final Paint dividerPaint;
public SearchEngineBarContainer(final Context context, final AttributeSet attrs) {
super(context, attrs);
dividerPaint = new Paint();
dividerPaint.setColor(getResources().getColor(R.color.divider_light));
}
@Override
public void onDraw(final Canvas canvas) {
super.onDraw(canvas);
canvas.drawLine(0, 0, getWidth(), 0, dividerPaint);
}
}
}

1
mobile/android/base/moz.build
View File

@ -340,7 +340,6 @@ gbjar.sources += [
'home/RemoteTabsSplitPlaneFragment.java',
'home/RemoteTabsStaticFragment.java',
'home/SearchEngine.java',
'home/SearchEngineBar.java',
'home/SearchEngineRow.java',
'home/SearchLoader.java',
'home/SimpleCursorLoader.java',

12
mobile/android/base/resources/color/pressed_about_page_header_grey.xml
View File

@ -1,12 +0,0 @@
<!-- 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/. -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@color/about_page_header_grey" />
<item android:drawable="@android:color/transparent"/>
</selector>

27
mobile/android/base/resources/layout/browser_search.xml
View File

@ -19,31 +19,4 @@
android:layout_height="0dp"
android:layout_weight="1" />
<!-- The window background is set to our desired color, #fff, so
reduce overdraw by not drawing the background.
Note: this needs to be transparent and not null because we
draw a divider in onDraw. -->
<view class="org.mozilla.gecko.home.SearchEngineBar$SearchEngineBarContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent">
<!-- We add a marginTop so the outer container can draw a divider.
listSelector is too slow for showing pressed state
so we set the pressed colors on the child. -->
<org.mozilla.gecko.home.SearchEngineBar
android:id="@+id/search_engine_bar"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_marginTop="1dp"
android:orientation="horizontal"
android:layout_gravity="center_horizontal"
android:choiceMode="singleChoice"
android:listSelector="@android:color/transparent"
android:cacheColorHint="@android:color/transparent"/>
</view>
</LinearLayout>

1
mobile/android/base/resources/layout/gecko_app.xml
View File

@ -77,6 +77,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/browser_chrome"
android:background="@android:color/white"
android:visibility="invisible"/>
<!-- When focus is cleared from from BrowserToolbar's EditText to

27
mobile/android/base/resources/layout/search_engine_bar_item.xml
View File

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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/. -->
<!-- TwoWayView doesn't let us set the margin around items (except as
gecko:itemMargin, but that doesn't increase the hit area) so we
have to surround the main View by a ViewGroup to create a pressable margin.
Note: the layout_height values are shared with the parent
View (browser_search at the time of this writing). -->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/search_engine_icon_container"
android:layout_height="match_parent"
android:layout_width="72dp"
android:background="@color/pressed_about_page_header_grey">
<!-- Width & height are set to make the Favicons as sharp as possible
based on asset size. -->
<org.mozilla.gecko.widget.FaviconView
android:id="@+id/search_engine_icon"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center"/>
</FrameLayout>

4
mobile/android/tests/browser/robocop/testInputUrlBar.java
View File

@ -88,10 +88,10 @@ public final class testInputUrlBar extends BaseTest {
assertUrlBarText("uv");
// Dismiss the VKB
mSolo.goBack();
mActions.sendSpecialKey(Actions.SpecialKey.BACK);
// Dismiss editing mode
mSolo.goBack();
mActions.sendSpecialKey(Actions.SpecialKey.BACK);
waitForText(mStringHelper.TITLE_PLACE_HOLDER);

10
modules/libpref/init/all.js
View File

@ -4749,13 +4749,3 @@ pref("dom.secureelement.enabled", false);
// both composition string and data attribute of compositionupdate
// and compositionend events.
pref("dom.compositionevent.allow_control_characters", false);
#ifdef MOZ_WIDGET_GONK
// Bug 1154053: Serialize B2G memory reports; smaller devices are
// usually overcommitted on memory by using zRAM, so memory reporting
// causes memory pressure from uncompressing cold heap memory.
pref("memory.report_concurrency", 1);
#else
// Desktop probably doesn't have swapped-out children like that.
pref("memory.report_concurrency", 10);
#endif

1
toolkit/components/aboutmemory/tests/test_aboutmemory5.xul
View File

@ -35,7 +35,6 @@
let prefs = [
["dom.ipc.processCount", 3], // Allow up to 3 child processes
["memory.report_concurrency", 2], // Cover more child handling cases
["memory.system_memory_reporter", true] // Test SystemMemoryReporter
];

181
xpcom/base/nsMemoryReporterManager.cpp
View File

@ -23,12 +23,9 @@
#endif
#include "mozilla/Attributes.h"
#include "mozilla/PodOperations.h"
#include "mozilla/Preferences.h"
#include "mozilla/Services.h"
#include "mozilla/Telemetry.h"
#include "mozilla/dom/PMemoryReportRequestParent.h" // for dom::MemoryReport
#include "mozilla/dom/ContentParent.h"
#include "mozilla/ipc/FileDescriptorUtils.h"
#ifdef XP_WIN
#include <process.h>
@ -1249,6 +1246,7 @@ nsMemoryReporterManager::nsMemoryReporterManager()
, mWeakReporters(new WeakReportersTable())
, mSavedStrongReporters(nullptr)
, mSavedWeakReporters(nullptr)
, mNumChildProcesses(0)
, mNextGeneration(1)
, mGetReportsState(nullptr)
{
@ -1273,6 +1271,29 @@ nsMemoryReporterManager::~nsMemoryReporterManager()
#define MEMORY_REPORTING_LOG(...)
#endif
void
nsMemoryReporterManager::IncrementNumChildProcesses()
{
if (!NS_IsMainThread()) {
MOZ_CRASH();
}
mNumChildProcesses++;
MEMORY_REPORTING_LOG("IncrementNumChildProcesses --> %d\n",
mNumChildProcesses);
}
void
nsMemoryReporterManager::DecrementNumChildProcesses()
{
if (!NS_IsMainThread()) {
MOZ_CRASH();
}
MOZ_ASSERT(mNumChildProcesses > 0);
mNumChildProcesses--;
MEMORY_REPORTING_LOG("DecrementNumChildProcesses --> %d\n",
mNumChildProcesses);
}
NS_IMETHODIMP
nsMemoryReporterManager::GetReports(
nsIHandleReportCallback* aHandleReport,
@ -1316,23 +1337,18 @@ nsMemoryReporterManager::GetReportsExtended(
return NS_OK;
}
MEMORY_REPORTING_LOG("GetReports (gen=%u)\n", generation);
MEMORY_REPORTING_LOG("GetReports (gen=%u, %d child(ren) present)\n",
generation, mNumChildProcesses);
uint32_t concurrency = Preferences::GetUint("memory.report_concurrency", 1);
MOZ_ASSERT(concurrency >= 1);
if (concurrency < 1) {
concurrency = 1;
}
mGetReportsState = new GetReportsState(generation,
aAnonymize,
aMinimize,
concurrency,
mNumChildProcesses,
aHandleReport,
aHandleReportData,
aFinishReporting,
aFinishReportingData,
aDMDDumpIdent);
mGetReportsState->mChildrenPending = new nsTArray<nsRefPtr<mozilla::dom::ContentParent>>();
if (aMinimize) {
rv = MinimizeMemoryUsage(NS_NewRunnableMethod(
@ -1364,18 +1380,12 @@ nsMemoryReporterManager::StartGettingReports()
GetReportsForThisProcessExtended(s->mHandleReport, s->mHandleReportData,
s->mAnonymize, parentDMDFile);
nsTArray<ContentParent*> childWeakRefs;
ContentParent::GetAll(childWeakRefs);
if (!childWeakRefs.IsEmpty()) {
MOZ_ASSERT(s->mNumChildProcessesCompleted == 0);
if (s->mNumChildProcesses > 0) {
// Request memory reports from child processes. This happens
// after the parent report so that the parent's main thread will
// be free to process the child reports, instead of causing them
// to be buffered and consume (possibly scarce) memory.
for (size_t i = 0; i < childWeakRefs.Length(); ++i) {
s->mChildrenPending->AppendElement(childWeakRefs[i]);
}
nsCOMPtr<nsITimer> timer = do_CreateInstance(NS_TIMER_CONTRACTID);
// Don't use NS_ENSURE_* here; can't return until the report is finished.
if (NS_WARN_IF(!timer)) {
@ -1392,12 +1402,27 @@ nsMemoryReporterManager::StartGettingReports()
MOZ_ASSERT(!s->mTimer);
s->mTimer.swap(timer);
}
// The parent's report is done; make note of that, and start
// launching child process reports (if any).
EndProcessReport(s->mGeneration, true);
return NS_OK;
nsCOMPtr<nsIObserverService> obs = services::GetObserverService();
if (NS_WARN_IF(!obs)) {
FinishReporting();
return NS_ERROR_UNEXPECTED;
}
nsPrintfCString genStr("generation=%x anonymize=%d minimize=%d DMDident=",
s->mGeneration, s->mAnonymize ? 1 : 0,
s->mMinimize ? 1 : 0);
nsAutoString msg = NS_ConvertUTF8toUTF16(genStr);
msg += s->mDMDDumpIdent;
obs->NotifyObservers(nullptr, "child-memory-reporter-request",
msg.get());
return NS_OK;
} else {
// If there are no child processes, we can finish up immediately.
return FinishReporting();
}
}
typedef nsCOMArray<nsIMemoryReporter> MemoryReporterArray;
@ -1477,12 +1502,17 @@ nsMemoryReporterManager::GetStateForGeneration(uint32_t aGeneration)
GetReportsState* s = mGetReportsState;
if (!s) {
// If we reach here, then:
// If we reach here, either:
//
// - A child process reported back too late, and no subsequent request
// is in flight.
//
// So there's nothing to be done. Just ignore it.
// - (Unlikely) A "child-memory-reporter-request" notification was
// triggered from somewhere other than GetReports(), causing child
// processes to report back when the nsMemoryReporterManager wasn't
// expecting it.
//
// Either way, there's nothing to be done. Just ignore it.
MEMORY_REPORTING_LOG(
"HandleChildReports: no request in flight (aGen=%u)\n",
aGeneration);
@ -1529,85 +1559,31 @@ nsMemoryReporterManager::HandleChildReport(
s->mHandleReportData);
}
/* static */ bool
nsMemoryReporterManager::StartChildReport(mozilla::dom::ContentParent* aChild,
const GetReportsState* aState)
{
#ifdef MOZ_NUWA_PROCESS
if (aChild->IsNuwaProcess()) {
return false;
}
#endif
if (!aChild->IsAlive()) {
MEMORY_REPORTING_LOG("StartChildReports (gen=%u): child exited before"
" its report was started\n",
aState->mGeneration);
return false;
}
mozilla::dom::MaybeFileDesc dmdFileDesc = void_t();
#ifdef MOZ_DMD
if (!aState->mDMDDumpIdent.IsEmpty()) {
FILE *dmdFile = nullptr;
nsresult rv = nsMemoryInfoDumper::OpenDMDFile(aState->mDMDDumpIdent,
aChild->Pid(), &dmdFile);
if (NS_WARN_IF(NS_FAILED(rv))) {
// Proceed with the memory report as if DMD were disabled.
dmdFile = nullptr;
}
if (dmdFile) {
dmdFileDesc = mozilla::ipc::FILEToFileDescriptor(dmdFile);
fclose(dmdFile);
}
}
#endif
return aChild->SendPMemoryReportRequestConstructor(
aState->mGeneration, aState->mAnonymize, aState->mMinimize, dmdFileDesc);
}
void
nsMemoryReporterManager::EndProcessReport(uint32_t aGeneration, bool aSuccess)
nsMemoryReporterManager::EndChildReport(uint32_t aGeneration, bool aSuccess)
{
GetReportsState* s = GetStateForGeneration(aGeneration);
if (!s) {
return;
}
MOZ_ASSERT(s->mNumProcessesRunning > 0);
s->mNumProcessesRunning--;
s->mNumProcessesCompleted++;
MEMORY_REPORTING_LOG("HandleChildReports (aGen=%u): process %u %s"
" (%u running, %u pending)\n",
aGeneration, s->mNumProcessesCompleted,
aSuccess ? "completed" : "exited during report",
s->mNumProcessesRunning,
static_cast<unsigned>(s->mChildrenPending->Length()));
s->mNumChildProcessesCompleted++;
// Start pending children up to the concurrency limit.
while (s->mNumProcessesRunning < s->mConcurrencyLimit &&
!s->mChildrenPending->IsEmpty()) {
// Pop last element from s->mChildrenPending
nsRefPtr<ContentParent> nextChild;
nextChild.swap(s->mChildrenPending->LastElement());
s->mChildrenPending->TruncateLength(s->mChildrenPending->Length() - 1);
// Start report (if the child is still alive and not Nuwa).
if (StartChildReport(nextChild, s)) {
++s->mNumProcessesRunning;
MEMORY_REPORTING_LOG("HandleChildReports (aGen=%u): started child report"
" (%u running, %u pending)\n",
aGeneration, s->mNumProcessesRunning,
static_cast<unsigned>(s->mChildrenPending->Length()));
}
if (aSuccess) {
MEMORY_REPORTING_LOG("HandleChildReports (aGen=%u): completed child %d\n",
aGeneration, s->mNumChildProcessesCompleted);
} else {
// Unfortunately, there's no way to indicate this in the report yet.
// (Also, we don't have the child's identifier at this point.)
MEMORY_REPORTING_LOG("HandleChildReports (aGen=%u): child %d exited"
" during report\n",
aGeneration, s->mNumChildProcessesCompleted);
}
// If all the child processes (if any) have reported, we can cancel
// the timer (if started) and finish up. Otherwise, just return.
if (s->mNumProcessesRunning == 0) {
MOZ_ASSERT(s->mChildrenPending->IsEmpty());
if (s->mTimer) {
s->mTimer->Cancel();
}
// If all the child processes have reported, we can cancel the timer and
// finish up. Otherwise, just return.
if (s->mNumChildProcessesCompleted >= s->mNumChildProcesses) {
s->mTimer->Cancel();
FinishReporting();
}
}
@ -1622,9 +1598,8 @@ nsMemoryReporterManager::TimeoutCallback(nsITimer* aTimer, void* aData)
// crash regardless of DEBUG, and this way the compiler doesn't
// complain about unused variables.
MOZ_RELEASE_ASSERT(s, "mgr->mGetReportsState");
MEMORY_REPORTING_LOG("TimeoutCallback (s->gen=%u; %u running, %u pending)\n",
s->mGeneration, s->mNumProcessesRunning,
static_cast<unsigned>(s->mChildrenPending->Length()));
MEMORY_REPORTING_LOG("TimeoutCallback (s->gen=%u)\n",
s->mGeneration);
// We don't bother sending any kind of cancellation message to the child
// processes that haven't reported back.
@ -1640,9 +1615,8 @@ nsMemoryReporterManager::FinishReporting()
}
MOZ_ASSERT(mGetReportsState);
MEMORY_REPORTING_LOG("FinishReporting (s->gen=%u; %u processes reported)\n",
mGetReportsState->mGeneration,
mGetReportsState->mNumProcessesCompleted);
MEMORY_REPORTING_LOG("FinishReporting (s->gen=%u)\n",
mGetReportsState->mGeneration);
// Call this before deleting |mGetReportsState|. That way, if
// |mFinishReportData| calls GetReports(), it will silently abort, as
@ -1655,11 +1629,6 @@ nsMemoryReporterManager::FinishReporting()
return rv;
}
nsMemoryReporterManager::GetReportsState::~GetReportsState()
{
delete mChildrenPending;
}
static void
CrashIfRefcountIsZero(nsISupports* aObj)
{

68
xpcom/base/nsMemoryReporterManager.h
View File

@ -7,22 +7,21 @@
#ifndef nsMemoryReporterManager_h__
#define nsMemoryReporterManager_h__
#include "mozilla/Mutex.h"
#include "nsHashKeys.h"
#include "nsIMemoryReporter.h"
#include "nsITimer.h"
#include "nsServiceManagerUtils.h"
#include "mozilla/Mutex.h"
#include "nsTHashtable.h"
#include "nsHashKeys.h"
class nsITimer;
namespace mozilla {
namespace dom {
class ContentParent;
class MemoryReport;
}
}
class nsITimer;
class nsMemoryReporterManager final : public nsIMemoryReporterManager
{
virtual ~nsMemoryReporterManager();
@ -44,27 +43,24 @@ public:
typedef nsTHashtable<nsRefPtrHashKey<nsIMemoryReporter>> StrongReportersTable;
typedef nsTHashtable<nsPtrHashKey<nsIMemoryReporter>> WeakReportersTable;
void IncrementNumChildProcesses();
void DecrementNumChildProcesses();
// Inter-process memory reporting proceeds as follows.
//
// - 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 --
// including a timer -- and starts telling child processes to get memory
// reports. Control then returns to the main event loop.
//
// The number of concurrent child process reports is limited by the pref
// "memory.report_concurrency" in order to prevent the memory overhead of
// memory reporting from causing problems, especially on B2G when swapping
// to compressed RAM; see bug 1154053.
// synchronously gets memory reports for the current process, tells all
// child processes to get memory reports, and sets up some state
// (mGetReportsState) for when the child processes report back, including a
// timer. Control then returns to the main event loop.
//
// - HandleChildReport() is called (asynchronously) once per child process
// reporter callback.
//
// - EndProcessReport() is called (asynchronously) once per process that
// finishes reporting back, including the parent. If all processes do so
// before time-out, the timer is cancelled. If there are child processes
// whose requests have not yet been sent, they will be started until the
// concurrency limit is (again) reached.
// - EndChildReport() is called (asynchronously) once per child process that
// finishes reporting back. If all child processes do so before time-out,
// the timer is cancelled. (The number of child processes is part of the
// saved request state.)
//
// - TimeoutCallback() is called (asynchronously) if all the child processes
// don't respond within the time threshold.
@ -108,12 +104,12 @@ 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
// of child process actors as of when the report started. So...
// middle of a request? Well, GetReportsState contains a copy of
// mNumChildProcesses which it uses to determine finished-ness. So...
//
// - If a process is created after reporting starts, it won't be sent a
// request for reports. So the reported data will reflect how things were
// when the request began.
// - If a process is created, it won't have received the request for reports,
// and the GetReportsState's mNumChildProcesses won't account for it. So
// the reported data will reflect how things were when the request began.
//
// - If a process is destroyed before it starts reporting back, the reported
// data will reflect how things are when the request ends.
@ -131,7 +127,7 @@ public:
//
void HandleChildReport(uint32_t aGeneration,
const mozilla::dom::MemoryReport& aChildReport);
void EndProcessReport(uint32_t aGeneration, bool aSuccess);
void EndChildReport(uint32_t aGeneration, bool aSuccess);
// Functions that (a) implement distinguished amounts, and (b) are outside of
// this module.
@ -203,6 +199,7 @@ private:
StrongReportersTable* mSavedStrongReporters;
WeakReportersTable* mSavedWeakReporters;
uint32_t mNumChildProcesses;
uint32_t mNextGeneration;
struct GetReportsState
@ -211,13 +208,8 @@ private:
bool mAnonymize;
bool mMinimize;
nsCOMPtr<nsITimer> mTimer;
// This is a pointer to an nsTArray because otherwise C++ is
// unhappy unless this header includes ContentParent.h, which not
// everything that includes this header knows how to find.
nsTArray<nsRefPtr<mozilla::dom::ContentParent>>* mChildrenPending;
uint32_t mNumProcessesRunning;
uint32_t mNumProcessesCompleted;
uint32_t mConcurrencyLimit;
uint32_t mNumChildProcesses;
uint32_t mNumChildProcessesCompleted;
nsCOMPtr<nsIHandleReportCallback> mHandleReport;
nsCOMPtr<nsISupports> mHandleReportData;
nsCOMPtr<nsIFinishReportingCallback> mFinishReporting;
@ -225,7 +217,7 @@ private:
nsString mDMDDumpIdent;
GetReportsState(uint32_t aGeneration, bool aAnonymize, bool aMinimize,
uint32_t aConcurrencyLimit,
uint32_t aNumChildProcesses,
nsIHandleReportCallback* aHandleReport,
nsISupports* aHandleReportData,
nsIFinishReportingCallback* aFinishReporting,
@ -234,10 +226,8 @@ private:
: mGeneration(aGeneration)
, mAnonymize(aAnonymize)
, mMinimize(aMinimize)
, mChildrenPending(nullptr)
, mNumProcessesRunning(1) // reporting starts with the parent
, mNumProcessesCompleted(0)
, mConcurrencyLimit(aConcurrencyLimit)
, mNumChildProcesses(aNumChildProcesses)
, mNumChildProcessesCompleted(0)
, mHandleReport(aHandleReport)
, mHandleReportData(aHandleReportData)
, mFinishReporting(aFinishReporting)
@ -245,8 +235,6 @@ private:
, mDMDDumpIdent(aDMDDumpIdent)
{
}
~GetReportsState();
};
// When this is non-null, a request is in flight. Note: We use manual
@ -255,8 +243,6 @@ private:
GetReportsState* mGetReportsState;
GetReportsState* GetStateForGeneration(uint32_t aGeneration);
static bool StartChildReport(mozilla::dom::ContentParent* aChild,
const GetReportsState* aState);
};
#define NS_MEMORY_REPORTER_MANAGER_CID \