moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-26 09:38:52 -05:00
Code Issues Releases Wiki Activity

Revert commit 829 @gcode - it was a performance optimization which added

Browse Source 
nontrivial code complexity for what's now a nil performance gain
This commit is contained in:
Jesse Vincent 2009-12-18 02:32:17 +00:00
parent c8bd377e76
commit 48e1f31b43
1 changed files with 35 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
src/com/fsck/k9/MessagingController.java
View File

@ -570,79 +570,6 @@ public class MessagingController implements Runnable
public void run()
{
Folder localFolder = null;
final LinkedBlockingQueue<MessageContainer> queue = new LinkedBlockingQueue<MessageContainer>();
final CountDownLatch latch = new CountDownLatch(1);
Runnable callbackRunner = new Runnable()
{
List<Message> pendingMessages = new ArrayList<Message>();
boolean stop = false;
public void run()
{
if (K9.DEBUG)
{
Log.v(K9.LOG_TAG, "listLocalMessages callbackRunner started");
}
while (stop == false)
{
MessageContainer messCont = null;
do
{
if (pendingMessages.isEmpty())
{
try
{
messCont = queue.take();
}
catch (InterruptedException ie)
{
Log.i(K9.LOG_TAG, "listLocalMessages callbackRunner interrupted");
}
}
else
{
messCont = queue.poll();
}
if (messCont != null)
{
if (messCont.last == true)
{
stop = true;
messCont = null;
}
else if (messCont.message != null)
{
pendingMessages.add(messCont.message);
}
}
}
while (messCont != null);
callbackPending();
}
latch.countDown();
if (K9.DEBUG)
{
Log.v(K9.LOG_TAG, "listLocalMessages callbackRunner finished");
}
}
private void callbackPending()
{
for (MessagingListener l : getListeners())
{
l.listLocalMessagesAddMessages(account, folder, pendingMessages);
}
if (listener != null && getListeners().contains(listener) == false)
{
listener.listLocalMessagesAddMessages(account, folder, pendingMessages);
}
pendingMessages.clear();
}
};
Thread callbackThread = new Thread(callbackRunner);
callbackThread.start();
try
{
@ -653,44 +580,49 @@ public class MessagingController implements Runnable
localFolder.getMessages(
new MessageRetrievalListener()
{
List<Message> pendingMessages = new ArrayList<Message>();
int totalDone = 0;
public void messageStarted(String message, int number, int ofTotal) {}
public void messageFinished(Message message, int number, int ofTotal)
{
if (!message.isSet(Flag.DELETED) && isMessageSuppressed(account, folder, message) == false)
{
MessageContainer messCont = new MessageContainer();
messCont.message = message;
queue.add(messCont);
totalDone++;
}
else
{
for (MessagingListener l : getListeners())
{
l.listLocalMessagesRemoveMessage(account, folder, message);
}
if (listener != null && getListeners().contains(listener) == false)
{
listener.listLocalMessagesRemoveMessage(account, folder, message);
}
}
public void messageFinished(Message message, int number, int ofTotal) {
if (!message.isSet(Flag.DELETED) && isMessageSuppressed(account, folder, message) == false) {
pendingMessages.add(message);
totalDone++;
if (totalDone < 5 || pendingMessages.size() > 4)
{
callbackPending();
}
} else {
for (MessagingListener l : getListeners()) {
l.listLocalMessagesRemoveMessage(account, folder, message);
}
if (listener != null && getListeners().contains(listener) == false) {
listener.listLocalMessagesRemoveMessage(account, folder, message);
}
}
}
public void messagesFinished(int number) {
callbackPending();
}
public void messagesFinished(int number)
private void callbackPending()
{
for (MessagingListener l : getListeners()) {
l.listLocalMessagesAddMessages(account, folder, pendingMessages);
}
if (listener != null && getListeners().contains(listener) == false) {
listener.listLocalMessagesAddMessages(account, folder, pendingMessages);
}
pendingMessages.clear();
}
},
false // Skip deleted messages
);
MessageContainer messCont = new MessageContainer();
messCont.last = true;
queue.add(messCont);
latch.await(1000, TimeUnit.MILLISECONDS);
if (K9.DEBUG)
{
Log.v(K9.LOG_TAG, "Got ack that callbackRunner finished");
@ -718,12 +650,6 @@ public class MessagingController implements Runnable
}
finally
{
if (latch.getCount() != 0)
{
MessageContainer messCont = new MessageContainer();
messCont.last = true;
queue.add(messCont);
}
if (localFolder != null)
{
try
@ -4469,9 +4395,4 @@ public class MessagingController implements Runnable
class MessageContainer
{
Message message;
boolean last;
}
}