From ba91fe269835c0aec984a95dd5fb9fc10b3be82d Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 18 Mar 2018 16:46:50 +0100 Subject: [PATCH] run roster sync in replacing task manager --- .../services/XmppConnectionService.java | 5 +- .../ReplacingSerialSingleThreadExecutor.java | 16 +++--- .../utils/ReplacingTaskManager.java | 57 +++++++++++++++++++ .../utils/SerialSingleThreadExecutor.java | 27 ++++----- 4 files changed, 79 insertions(+), 26 deletions(-) create mode 100644 src/main/java/eu/siacs/conversations/utils/ReplacingTaskManager.java diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 75c4b87a8..810e0ec09 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -105,6 +105,7 @@ import eu.siacs.conversations.utils.OnPhoneContactsLoadedListener; import eu.siacs.conversations.utils.PRNGFixes; import eu.siacs.conversations.utils.PhoneHelper; import eu.siacs.conversations.utils.ReplacingSerialSingleThreadExecutor; +import eu.siacs.conversations.utils.ReplacingTaskManager; import eu.siacs.conversations.utils.Resolver; import eu.siacs.conversations.utils.SerialSingleThreadExecutor; import eu.siacs.conversations.xml.Namespace; @@ -157,6 +158,7 @@ public class XmppConnectionService extends Service { private final SerialSingleThreadExecutor mDatabaseWriterExecutor = new SerialSingleThreadExecutor("DatabaseWriter"); private final SerialSingleThreadExecutor mDatabaseReaderExecutor = new SerialSingleThreadExecutor("DatabaseReader"); private final SerialSingleThreadExecutor mNotificationExecutor = new SerialSingleThreadExecutor("NotificationExecutor"); + private final ReplacingTaskManager mRosterSyncTaskManager = new ReplacingTaskManager(); private final IBinder mBinder = new XmppConnectionBinder(); private final List conversations = new CopyOnWriteArrayList<>(); private final IqGenerator mIqGenerator = new IqGenerator(this); @@ -1459,7 +1461,7 @@ public class XmppConnectionService extends Service { public void syncRoster(final Account account) { - mDatabaseWriterExecutor.execute(() -> databaseBackend.writeRoster(account.getRoster())); + mRosterSyncTaskManager.execute(account, () -> databaseBackend.writeRoster(account.getRoster())); } public List getConversations() { @@ -1855,6 +1857,7 @@ public class XmppConnectionService extends Service { }; mDatabaseWriterExecutor.execute(runnable); this.accounts.remove(account); + this.mRosterSyncTaskManager.clear(account); updateAccountUi(); getNotificationService().updateErrorNotification(); syncEnabledAccountSetting(); diff --git a/src/main/java/eu/siacs/conversations/utils/ReplacingSerialSingleThreadExecutor.java b/src/main/java/eu/siacs/conversations/utils/ReplacingSerialSingleThreadExecutor.java index 0e97ef639..321dd9c89 100644 --- a/src/main/java/eu/siacs/conversations/utils/ReplacingSerialSingleThreadExecutor.java +++ b/src/main/java/eu/siacs/conversations/utils/ReplacingSerialSingleThreadExecutor.java @@ -2,13 +2,13 @@ package eu.siacs.conversations.utils; public class ReplacingSerialSingleThreadExecutor extends SerialSingleThreadExecutor { - public ReplacingSerialSingleThreadExecutor(boolean prepareLooper) { - super(ReplacingSerialSingleThreadExecutor.class.getName(), prepareLooper); - } + public ReplacingSerialSingleThreadExecutor(boolean prepareLooper) { + super(ReplacingSerialSingleThreadExecutor.class.getName(), prepareLooper); + } - @Override - public synchronized void execute(final Runnable r) { - tasks.clear(); - super.execute(r); - } + @Override + public synchronized void execute(final Runnable r) { + tasks.clear(); + super.execute(r); + } } diff --git a/src/main/java/eu/siacs/conversations/utils/ReplacingTaskManager.java b/src/main/java/eu/siacs/conversations/utils/ReplacingTaskManager.java new file mode 100644 index 000000000..a06988373 --- /dev/null +++ b/src/main/java/eu/siacs/conversations/utils/ReplacingTaskManager.java @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2018, Daniel Gultsch All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation and/or + * other materials provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors + * may be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package eu.siacs.conversations.utils; + +import java.util.HashMap; + +import eu.siacs.conversations.entities.Account; + +public class ReplacingTaskManager { + + private final HashMap executors = new HashMap<>(); + + public void execute(final Account account, Runnable runnable) { + ReplacingSerialSingleThreadExecutor executor; + synchronized (this.executors) { + executor = this.executors.get(account); + if (executor == null) { + executor = new ReplacingSerialSingleThreadExecutor(false); + this.executors.put(account, executor); + } + executor.execute(runnable); + } + } + + public void clear(Account account) { + synchronized (this.executors) { + this.executors.remove(account); + } + } +} diff --git a/src/main/java/eu/siacs/conversations/utils/SerialSingleThreadExecutor.java b/src/main/java/eu/siacs/conversations/utils/SerialSingleThreadExecutor.java index 8c8b03f1a..c25ed10cc 100644 --- a/src/main/java/eu/siacs/conversations/utils/SerialSingleThreadExecutor.java +++ b/src/main/java/eu/siacs/conversations/utils/SerialSingleThreadExecutor.java @@ -13,8 +13,8 @@ import eu.siacs.conversations.services.AttachFileToConversationRunnable; public class SerialSingleThreadExecutor implements Executor { - final Executor executor = Executors.newSingleThreadExecutor(); - protected final ArrayDeque tasks = new ArrayDeque<>(); + private final Executor executor = Executors.newSingleThreadExecutor(); + final ArrayDeque tasks = new ArrayDeque<>(); private Runnable active; private final String name; @@ -22,26 +22,19 @@ public class SerialSingleThreadExecutor implements Executor { this(name, false); } - public SerialSingleThreadExecutor(String name, boolean prepareLooper) { + SerialSingleThreadExecutor(String name, boolean prepareLooper) { if (prepareLooper) { - execute(new Runnable() { - @Override - public void run() { - Looper.prepare(); - } - }); + execute(Looper::prepare); } this.name = name; } public synchronized void execute(final Runnable r) { - tasks.offer(new Runnable() { - public void run() { - try { - r.run(); - } finally { - scheduleNext(); - } + tasks.offer(() -> { + try { + r.run(); + } finally { + scheduleNext(); } }); if (active == null) { @@ -49,7 +42,7 @@ public class SerialSingleThreadExecutor implements Executor { } } - protected synchronized void scheduleNext() { + private synchronized void scheduleNext() { if ((active = tasks.poll()) != null) { executor.execute(active); int remaining = tasks.size();