mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Update operation partitions

This commit is contained in:
M66B 2020-01-27 10:24:47 +01:00
parent 70392bdeb1
commit 3bf94520cb
1 changed files with 50 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View File

@ -1122,26 +1122,9 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
db.operation().liveOperations(folder.id).observe(cowner, new Observer<List<TupleOperationEx>>() { db.operation().liveOperations(folder.id).observe(cowner, new Observer<List<TupleOperationEx>>() {
private List<Long> handling = new ArrayList<>(); private List<Long> handling = new ArrayList<>();
private final PowerManager.WakeLock wlFolder = pm.newWakeLock(
PowerManager.PARTIAL_WAKE_LOCK, BuildConfig.APPLICATION_ID + ":folder." + folder.id);
@Override private final Map<TupleOperationEx.PartitionKey, List<TupleOperationEx>> partitions =
public void onChanged(final List<TupleOperationEx> _operations) { new TreeMap<>(new Comparator<TupleOperationEx.PartitionKey>() {
List<Long> ops = new ArrayList<>();
List<TupleOperationEx> submit = new ArrayList<>();
for (TupleOperationEx op : _operations) {
if (!handling.contains(op.id))
submit.add(op);
ops.add(op.id);
}
handling = ops;
if (submit.size() > 0) {
Log.i(folder.name + " queuing operations=" + submit.size() +
" init=" + folder.initialize + " poll=" + folder.poll);
// Partition operations by priority
Map<TupleOperationEx.PartitionKey, List<TupleOperationEx>> partitions = new TreeMap<>(new Comparator<TupleOperationEx.PartitionKey>() {
@Override @Override
public int compare(TupleOperationEx.PartitionKey k1, TupleOperationEx.PartitionKey k2) { public int compare(TupleOperationEx.PartitionKey k1, TupleOperationEx.PartitionKey k2) {
Integer p1 = k1.getPriority(); Integer p1 = k1.getPriority();
@ -1150,17 +1133,47 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
} }
}); });
private final PowerManager.WakeLock wlFolder = pm.newWakeLock(
PowerManager.PARTIAL_WAKE_LOCK, BuildConfig.APPLICATION_ID + ":folder." + folder.id);
@Override
public void onChanged(final List<TupleOperationEx> _operations) {
// Get new operations
List<Long> ops = new ArrayList<>();
List<TupleOperationEx> added = new ArrayList<>();
for (TupleOperationEx op : _operations) {
if (!handling.contains(op.id))
added.add(op);
ops.add(op.id);
}
handling = ops;
if (added.size() > 0) {
Log.i(folder.name + " queuing operations=" + added.size() +
" init=" + folder.initialize + " poll=" + folder.poll);
// Partition operations by priority
boolean offline = (mapFolders.get(folder) == null); boolean offline = (mapFolders.get(folder) == null);
for (TupleOperationEx op : submit) { List<TupleOperationEx.PartitionKey> keys = new ArrayList<>();
synchronized (partitions) {
for (TupleOperationEx op : added) {
TupleOperationEx.PartitionKey key = op.getPartitionKey(offline); TupleOperationEx.PartitionKey key = op.getPartitionKey(offline);
if (!partitions.containsKey(key))
if (!partitions.containsKey(key)) {
partitions.put(key, new ArrayList<>()); partitions.put(key, new ArrayList<>());
partitions.get(key).add(op); keys.add(key);
} }
for (TupleOperationEx.PartitionKey key : partitions.keySet()) { partitions.get(key).add(op);
List<TupleOperationEx> partition = partitions.get(key); }
Log.i(folder.name + " queuing operations=" + partition.size() + " key=" + key); }
for (TupleOperationEx.PartitionKey key : keys) {
synchronized (partitions) {
Log.i(folder.name +
" queuing partition=" + key +
" operations=" + partitions.get(key).size());
}
executor.submit(new Helper.PriorityRunnable(key.getPriority()) { executor.submit(new Helper.PriorityRunnable(key.getPriority()) {
@Override @Override
@ -1168,7 +1181,16 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
super.run(); super.run();
try { try {
wlFolder.acquire(); wlFolder.acquire();
Log.i(folder.name + " process");
List<TupleOperationEx> partition;
synchronized (partitions) {
partition = partitions.get(key);
partitions.remove(key);
}
Log.i(folder.name +
" executing partition=" + key +
" operations=" + partition.size());
// Get folder // Get folder
Folder ifolder = mapFolders.get(folder); // null when polling Folder ifolder = mapFolders.get(folder); // null when polling