mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset 96dab44be3ba (bug 1351673) for Android build bustage 

CLOSED TREE

MozReview-Commit-ID: 4XV7Be9AXmB
This commit is contained in:
Phil Ringnalda 2017-09-20 18:56:18 -07:00
Родитель 516e2b5d7c
Коммит a50c867aa4
2 изменённых файлов: 96 добавлений и 31 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

69
mobile/android/services/src/main/java/org/mozilla/gecko/sync/DelayedWorkTracker.java Normal file
Просмотреть файл

@ -0,0 +1,69 @@
/* 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.sync;
import org.mozilla.gecko.background.common.log.Logger;
/**
* A little class to allow us to maintain a count of extant
* things (in our case, callbacks that need to fire), and
* some work that we want done when that count hits 0.
*
* @author rnewman
*
*/
public class DelayedWorkTracker {
private static final String LOG_TAG = "DelayedWorkTracker";
protected Runnable workItem = null;
protected int outstandingCount = 0;
public int incrementOutstanding() {
Logger.trace(LOG_TAG, "Incrementing outstanding.");
synchronized(this) {
return ++outstandingCount;
}
}
public int decrementOutstanding() {
Logger.trace(LOG_TAG, "Decrementing outstanding.");
Runnable job = null;
int count;
synchronized(this) {
if ((count = --outstandingCount) == 0 &&
workItem != null) {
job = workItem;
workItem = null;
} else {
return count;
}
}
job.run();
// In case it's changed.
return getOutstandingOperations();
}
public int getOutstandingOperations() {
synchronized(this) {
return outstandingCount;
}
}
public void delayWorkItem(Runnable item) {
Logger.trace(LOG_TAG, "delayWorkItem.");
boolean runnableNow = false;
synchronized(this) {
Logger.trace(LOG_TAG, "outstandingCount: " + outstandingCount);
if (outstandingCount == 0) {
runnableNow = true;
} else {
if (workItem != null) {
throw new IllegalStateException("Work item already set!");
}
workItem = item;
}
}
if (runnableNow) {
Logger.trace(LOG_TAG, "Running item now.");
item.run();
}
}
}

58
mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/downloaders/BatchingDownloader.java
Просмотреть файл

@ -12,6 +12,7 @@ import android.support.annotation.VisibleForTesting;
import org.mozilla.gecko.background.common.log.Logger;
import org.mozilla.gecko.sync.CollectionConcurrentModificationException;
import org.mozilla.gecko.sync.CryptoRecord;
import org.mozilla.gecko.sync.DelayedWorkTracker;
import org.mozilla.gecko.sync.SyncDeadlineReachedException;
import org.mozilla.gecko.sync.Utils;
import org.mozilla.gecko.sync.net.AuthHeaderProvider;
@ -28,8 +29,6 @@ import java.net.URISyntaxException;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
/**
@ -59,6 +58,7 @@ public class BatchingDownloader {
private static final String DEFAULT_SORT_ORDER = "index";
private final RepositorySession repositorySession;
private final DelayedWorkTracker workTracker = new DelayedWorkTracker();
private final Uri baseCollectionUri;
private final long fetchDeadline;
private final boolean allowMultipleBatches;
@ -73,8 +73,6 @@ public class BatchingDownloader {
protected final Set<SyncStorageCollectionRequest> pending = Collections.synchronizedSet(new HashSet<SyncStorageCollectionRequest>());
/* @GuardedBy("this") */ private String lastModified;
private final ExecutorService taskQueue = Executors.newSingleThreadExecutor();
public BatchingDownloader(
AuthHeaderProvider authHeaderProvider,
Uri baseCollectionUri,
@ -93,7 +91,7 @@ public class BatchingDownloader {
}
@VisibleForTesting
/* package-private */ static String flattenIDs(String[] guids) {
protected static String flattenIDs(String[] guids) {
// Consider using Utils.toDelimitedString if and when the signature changes
// to Collection<String> guids.
if (guids.length == 0) {
@ -112,23 +110,18 @@ public class BatchingDownloader {
}
@VisibleForTesting
protected void fetchWithParameters(final long newer,
final long batchLimit,
final boolean full,
final String sort,
final String ids,
final SyncStorageCollectionRequest request,
final RepositorySessionFetchRecordsDelegate fetchRecordsDelegate)
protected void fetchWithParameters(long newer,
long batchLimit,
boolean full,
String sort,
String ids,
SyncStorageCollectionRequest request,
RepositorySessionFetchRecordsDelegate fetchRecordsDelegate)
throws URISyntaxException, UnsupportedEncodingException {
taskQueue.execute(new Runnable() {
@Override
public void run() {
request.delegate = new BatchingDownloaderDelegate(BatchingDownloader.this, fetchRecordsDelegate, request,
newer, batchLimit, full, sort, ids);
pending.add(request);
request.get();
}
});
request.delegate = new BatchingDownloaderDelegate(this, fetchRecordsDelegate, request,
newer, batchLimit, full, sort, ids);
this.pending.add(request);
request.get();
}
@VisibleForTesting
@ -222,10 +215,10 @@ public class BatchingDownloader {
Logger.warn(LOG_TAG, "Failed to reset resume context while completing a batch");
}
taskQueue.execute(new Runnable() {
this.workTracker.delayWorkItem(new Runnable() {
@Override
public void run() {
Logger.debug(LOG_TAG, "onFetchCompleted running.");
Logger.debug(LOG_TAG, "Delayed onFetchCompleted running.");
fetchRecordsDelegate.onFetchCompleted();
}
});
@ -247,10 +240,9 @@ public class BatchingDownloader {
// We need to make another batching request!
// Let the delegate know that a batch fetch just completed before we proceed.
// Beware that while this operation will run after every call to onFetchedRecord returned,
// it's not guaranteed that the 'sink' session actually processed all of the fetched records.
// See Bug https://bugzilla.mozilla.org/show_bug.cgi?id=1351673#c28 for details.
taskQueue.execute(new Runnable() {
// This operation needs to run after every call to onFetchedRecord for this batch has been
// processed, hence the delayWorkItem call.
this.workTracker.delayWorkItem(new Runnable() {
@Override
public void run() {
Logger.debug(LOG_TAG, "Running onBatchCompleted.");
@ -273,10 +265,10 @@ public class BatchingDownloader {
if (!this.stateProvider.commit()) {
Logger.warn(LOG_TAG, "Failed to commit repository state while handling request creation error");
}
taskQueue.execute(new Runnable() {
this.workTracker.delayWorkItem(new Runnable() {
@Override
public void run() {
Logger.debug(LOG_TAG, "onFetchCompleted running.");
Logger.debug(LOG_TAG, "Delayed onFetchCompleted running.");
fetchRecordsDelegate.onFetchFailed(e);
}
});
@ -312,7 +304,7 @@ public class BatchingDownloader {
}
}
taskQueue.execute(new Runnable() {
this.workTracker.delayWorkItem(new Runnable() {
@Override
public void run() {
Logger.debug(LOG_TAG, "Running onFetchFailed.");
@ -323,6 +315,8 @@ public class BatchingDownloader {
public void onFetchedRecord(CryptoRecord record,
RepositorySessionFetchRecordsDelegate fetchRecordsDelegate) {
this.workTracker.incrementOutstanding();
try {
fetchRecordsDelegate.onFetchedRecord(record);
// NB: changes to stateProvider are committed in either onFetchCompleted or handleFetchFailed.
@ -332,6 +326,8 @@ public class BatchingDownloader {
} catch (Exception ex) {
Logger.warn(LOG_TAG, "Got exception calling onFetchedRecord with WBO.", ex);
throw new RuntimeException(ex);
} finally {
this.workTracker.decrementOutstanding();
}
}
@ -366,7 +362,7 @@ public class BatchingDownloader {
}
@VisibleForTesting
/* package-private */ static URI buildCollectionURI(Uri baseCollectionUri, boolean full, long newer, long limit, String sort, String ids, String offset) throws URISyntaxException {
public static URI buildCollectionURI(Uri baseCollectionUri, boolean full, long newer, long limit, String sort, String ids, String offset) throws URISyntaxException {
Uri.Builder uriBuilder = baseCollectionUri.buildUpon();
if (full) {