cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

import: reduce number of threads a little, and code cleanup

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-10-29 17:14:22 +01:00
parent ee79cc76d3
commit 55e22e68b4
1 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java
View File

@@ -82,6 +82,8 @@ import org.sufficientlysecure.keychain.util.orbot.OrbotHelper;
*/ */
public class ImportOperation extends BaseOperation<ImportKeyringParcel> { public class ImportOperation extends BaseOperation<ImportKeyringParcel> {
public static final int MAX_THREADS = 10;
public ImportOperation(Context context, ProviderHelper providerHelper, Progressable public ImportOperation(Context context, ProviderHelper providerHelper, Progressable
progressable) { progressable) {
super(context, providerHelper, progressable); super(context, providerHelper, progressable);
@@ -412,61 +414,57 @@ public class ImportOperation extends BaseOperation<ImportKeyringParcel> {
} }
@NonNull @NonNull
private ImportKeyResult multiThreadedKeyImport(Iterator<ParcelableKeyRing> keyListIterator, private ImportKeyResult multiThreadedKeyImport(@NonNull Iterator<ParcelableKeyRing> keyListIterator,
int totKeys, final String keyServer, int totKeys, final String keyServer,
final Proxy proxy) { final Proxy proxy) {
Log.d(Constants.TAG, "Multi-threaded key import starting"); Log.d(Constants.TAG, "Multi-threaded key import starting");
if (keyListIterator != null) { KeyImportAccumulator accumulator = new KeyImportAccumulator(totKeys, mProgressable);
KeyImportAccumulator accumulator = new KeyImportAccumulator(totKeys, mProgressable);
final ProgressScaler ignoreProgressable = new ProgressScaler(); final ProgressScaler ignoreProgressable = new ProgressScaler();
final int maxThreads = 200; ExecutorService importExecutor = new ThreadPoolExecutor(0, MAX_THREADS, 30L, TimeUnit.SECONDS,
ExecutorService importExecutor = new ThreadPoolExecutor(0, maxThreads, new SynchronousQueue<Runnable>());
30L, TimeUnit.SECONDS,
new SynchronousQueue<Runnable>());
ExecutorCompletionService<ImportKeyResult> importCompletionService = ExecutorCompletionService<ImportKeyResult> importCompletionService =
new ExecutorCompletionService<>(importExecutor); new ExecutorCompletionService<>(importExecutor);
while (keyListIterator.hasNext()) { // submit all key rings to be imported while (keyListIterator.hasNext()) { // submit all key rings to be imported
final ParcelableKeyRing pkRing = keyListIterator.next(); final ParcelableKeyRing pkRing = keyListIterator.next();
Callable<ImportKeyResult> importOperationCallable = new Callable<ImportKeyResult> Callable<ImportKeyResult> importOperationCallable = new Callable<ImportKeyResult>
() { () {
@Override @Override
public ImportKeyResult call() { public ImportKeyResult call() {
ArrayList<ParcelableKeyRing> list = new ArrayList<>(); ArrayList<ParcelableKeyRing> list = new ArrayList<>();
list.add(pkRing); list.add(pkRing);
return serialKeyRingImport(list.iterator(), 1, keyServer, ignoreProgressable, proxy); return serialKeyRingImport(list.iterator(), 1, keyServer, ignoreProgressable, proxy);
} }
}; };
importCompletionService.submit(importOperationCallable); importCompletionService.submit(importOperationCallable);
} }
while (!accumulator.isImportFinished()) { // accumulate the results of each import while (!accumulator.isImportFinished()) { // accumulate the results of each import
try { try {
accumulator.accumulateKeyImport(importCompletionService.take().get()); accumulator.accumulateKeyImport(importCompletionService.take().get());
} catch (InterruptedException | ExecutionException e) { } catch (InterruptedException | ExecutionException e) {
Log.e(Constants.TAG, "A key could not be imported during multi-threaded " + Log.e(Constants.TAG, "A key could not be imported during multi-threaded " +
"import", e); "import", e);
// do nothing? // do nothing?
if (e instanceof ExecutionException) { if (e instanceof ExecutionException) {
// Since serialKeyRingImport does not throw any exceptions, this is what // Since serialKeyRingImport does not throw any exceptions, this is what
// would have happened if // would have happened if
// we were importing the key on this thread // we were importing the key on this thread
throw new RuntimeException(); throw new RuntimeException();
}
} }
} }
return accumulator.getConsolidatedResult();
} }
return new ImportKeyResult(ImportKeyResult.RESULT_FAIL_NOTHING, new OperationLog()); return accumulator.getConsolidatedResult();
} }
/** /**
@@ -500,7 +498,7 @@ public class ImportOperation extends BaseOperation<ImportKeyringParcel> {
} }
} }
public synchronized void accumulateKeyImport(ImportKeyResult result) { public void accumulateKeyImport(ImportKeyResult result) {
mImportedKeys++; mImportedKeys++;
if (mProgressable != null) { if (mProgressable != null) {