Bug 1128561 - Do a PRAGMA shrink_memory when we get a TrimMemory notification. r?grisha
MozReview-Commit-ID: KoNcRuPvgE8
--- a/mobile/android/base/java/org/mozilla/gecko/MemoryMonitor.java
+++ b/mobile/android/base/java/org/mozilla/gecko/MemoryMonitor.java
@@ -2,26 +2,28 @@
* 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;
import org.mozilla.gecko.db.BrowserDB;
import org.mozilla.gecko.db.BrowserContract;
+import org.mozilla.gecko.db.BrowserProvider;
import org.mozilla.gecko.favicons.Favicons;
import org.mozilla.gecko.home.ImageLoader;
import org.mozilla.gecko.util.ThreadUtils;
import android.content.BroadcastReceiver;
import android.content.ComponentCallbacks2;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
+import android.support.v4.content.LocalBroadcastManager;
import android.util.Log;
/**
* This is a utility class to keep track of how much memory and disk-space pressure
* the system is under. It receives input from GeckoActivity via the onLowMemory() and
* onTrimMemory() functions, and also listens for some system intents related to
* disk-space notifications. Internally it will track how much memory and disk pressure
* the system is under, and perform various actions to help alleviate the pressure.
@@ -49,37 +51,39 @@ class MemoryMonitor extends BroadcastRec
private static final int MEMORY_PRESSURE_HIGH = 4;
private static final MemoryMonitor sInstance = new MemoryMonitor();
static MemoryMonitor getInstance() {
return sInstance;
}
+ private Context mAppContext;
private final PressureDecrementer mPressureDecrementer;
private int mMemoryPressure; // Synchronized access only.
private volatile boolean mStoragePressure; // Accessed via UI thread intent, background runnables.
private boolean mInited;
private MemoryMonitor() {
mPressureDecrementer = new PressureDecrementer();
mMemoryPressure = MEMORY_PRESSURE_NONE;
}
public void init(final Context context) {
if (mInited) {
return;
}
+ mAppContext = context.getApplicationContext();
IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_DEVICE_STORAGE_LOW);
filter.addAction(Intent.ACTION_DEVICE_STORAGE_OK);
filter.addAction(ACTION_MEMORY_DUMP);
filter.addAction(ACTION_FORCE_PRESSURE);
- context.getApplicationContext().registerReceiver(this, filter);
+ mAppContext.registerReceiver(this, filter);
mInited = true;
}
public void onLowMemory() {
Log.d(LOGTAG, "onLowMemory() notification received");
if (increaseMemoryPressure(MEMORY_PRESSURE_HIGH)) {
// We need to wait on Gecko here, because if we haven't reduced
// memory usage enough when we return from this, Android will kill us.
@@ -172,16 +176,18 @@ class MemoryMonitor extends BroadcastRec
if (level >= MEMORY_PRESSURE_MEDIUM) {
//Only send medium or higher events because that's all that is used right now
if (GeckoThread.isRunning()) {
GeckoAppShell.dispatchMemoryPressure();
}
Favicons.clearMemCache();
ImageLoader.clearLruCache();
+ LocalBroadcastManager.getInstance(mAppContext)
+ .sendBroadcast(new Intent(BrowserProvider.ACTION_SHRINK_MEMORY));
}
return true;
}
/**
* Thread-safe due to mStoragePressure's volatility.
*/
boolean isUnderStoragePressure() {
--- a/mobile/android/base/java/org/mozilla/gecko/db/BrowserProvider.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/BrowserProvider.java
@@ -1,15 +1,16 @@
/* -*- 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.db;
+import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.mozilla.gecko.AboutPages;
import org.mozilla.gecko.GeckoProfile;
@@ -22,35 +23,43 @@ import org.mozilla.gecko.db.BrowserContr
import org.mozilla.gecko.db.BrowserContract.Visits;
import org.mozilla.gecko.db.BrowserContract.Schema;
import org.mozilla.gecko.db.BrowserContract.Tabs;
import org.mozilla.gecko.db.BrowserContract.Thumbnails;
import org.mozilla.gecko.db.BrowserContract.TopSites;
import org.mozilla.gecko.db.BrowserContract.UrlAnnotations;
import org.mozilla.gecko.db.DBUtils.UpdateOperation;
import org.mozilla.gecko.sync.Utils;
+import org.mozilla.gecko.util.ThreadUtils;
+import android.content.BroadcastReceiver;
import android.content.ContentProviderOperation;
import android.content.ContentProviderResult;
import android.content.ContentUris;
import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
import android.content.OperationApplicationException;
import android.content.UriMatcher;
import android.database.Cursor;
import android.database.DatabaseUtils;
import android.database.MatrixCursor;
import android.database.SQLException;
import android.database.sqlite.SQLiteCursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteQueryBuilder;
import android.net.Uri;
+import android.support.v4.content.LocalBroadcastManager;
import android.text.TextUtils;
import android.util.Log;
public class BrowserProvider extends SharedBrowserDatabaseProvider {
+ public static final String ACTION_SHRINK_MEMORY = "org.mozilla.gecko.db.intent.action.SHRINK_MEMORY";
+
private static final String LOGTAG = "GeckoBrowserProvider";
// How many records to reposition in a single query.
// This should be less than the SQLite maximum number of query variables
// (currently 999) divided by the number of variables used per positioning
// query (currently 3).
static final int MAX_POSITION_UPDATES_PER_QUERY = 100;
@@ -274,16 +283,63 @@ public class BrowserProvider extends Sha
URI_MATCHER.addURI(BrowserContract.AUTHORITY, type.name, type.id);
}
}
// Combined pinned sites, top visited sites, and suggested sites
URI_MATCHER.addURI(BrowserContract.AUTHORITY, "topsites", TOPSITES);
}
+ private static class ShrinkMemoryReceiver extends BroadcastReceiver {
+ private final WeakReference<BrowserProvider> mBrowserProviderWeakReference;
+
+ public ShrinkMemoryReceiver(final BrowserProvider browserProvider) {
+ mBrowserProviderWeakReference = new WeakReference<>(browserProvider);
+ }
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ final BrowserProvider browserProvider = mBrowserProviderWeakReference.get();
+ if (browserProvider == null) {
+ return;
+ }
+ final PerProfileDatabases<BrowserDatabaseHelper> databases = browserProvider.getDatabases();
+ if (databases == null) {
+ return;
+ }
+ ThreadUtils.postToBackgroundThread(new Runnable() {
+ @Override
+ public void run() {
+ databases.shrinkMemory();
+ }
+ });
+ }
+ }
+
+ private final ShrinkMemoryReceiver mShrinkMemoryReceiver = new ShrinkMemoryReceiver(this);
+
+ @Override
+ public boolean onCreate() {
+ if (!super.onCreate()) {
+ return false;
+ }
+
+ LocalBroadcastManager.getInstance(getContext()).registerReceiver(mShrinkMemoryReceiver,
+ new IntentFilter(ACTION_SHRINK_MEMORY));
+
+ return true;
+ }
+
+ @Override
+ public void shutdown() {
+ LocalBroadcastManager.getInstance(getContext()).unregisterReceiver(mShrinkMemoryReceiver);
+
+ super.shutdown();
+ }
+
// Convenience accessor.
// Assumes structure of sTables!
private URLMetadataTable getURLMetadataTable() {
return (URLMetadataTable) sTables[0];
}
private static boolean hasFaviconsInProjection(String[] projection) {
if (projection == null) return true;
--- a/mobile/android/base/java/org/mozilla/gecko/db/PerProfileDatabases.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/PerProfileDatabases.java
@@ -5,16 +5,17 @@
package org.mozilla.gecko.db;
import java.io.File;
import java.util.HashMap;
import org.mozilla.gecko.GeckoProfile;
import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.text.TextUtils;
/**
* Manages a set of per-profile database storage helpers.
*/
public class PerProfileDatabases<T extends SQLiteOpenHelper> {
@@ -78,9 +79,16 @@ public class PerProfileDatabases<T exten
final T helper = mHelperFactory.makeDatabaseHelper(mContext, databasePath);
DBUtils.ensureDatabaseIsNotLocked(helper, databasePath);
mStorages.put(profile, helper);
return helper;
}
}
+
+ public synchronized void shrinkMemory() {
+ for (T t : mStorages.values()) {
+ final SQLiteDatabase db = t.getWritableDatabase();
+ db.execSQL("PRAGMA shrink_memory");
+ }
+ }
}