Enable plain old QTimer-based asynchronous message processing. More fancy stuff will...

diff --git a/src/client/abstractmessageprocessor.cpp b/src/client/abstractmessageprocessor.cpp
index 5ba8683..0f692af 100644 (file)
--- a/src/client/abstractmessageprocessor.cpp
+++ b/src/client/abstractmessageprocessor.cpp
@@ -28,14 +28,6 @@ AbstractMessageProcessor::AbstractMessageProcessor(QObject *parent) : QObject(pa
 
 }
 
 
 }
 

-void AbstractMessageProcessor::process(Message &msg) {
-  processMessage(msg);
+void AbstractMessageProcessor::postProcess(Message &msg) {

   Client::buffer(msg.bufferInfo())->updateActivityLevel(msg);
 }
   Client::buffer(msg.bufferInfo())->updateActivityLevel(msg);
 }

-
-void AbstractMessageProcessor::process(QList<Message> &msgs) {
-  processMessages(msgs);
-  foreach(Message msg, msgs) {
-    Client::buffer(msg.bufferInfo())->updateActivityLevel(msg);
-  }
-}

diff --git a/src/client/abstractmessageprocessor.h b/src/client/abstractmessageprocessor.h
index b140ac1..f02728c 100644 (file)
--- a/src/client/abstractmessageprocessor.h
+++ b/src/client/abstractmessageprocessor.h
@@ -30,14 +30,13 @@ class AbstractMessageProcessor : public QObject {
     AbstractMessageProcessor(QObject *parent);
 
   public slots:
     AbstractMessageProcessor(QObject *parent);
 
   public slots:

-    void process(Message &msg);
-    void process(QList<Message> &msgs);
+    virtual void process(Message &msg) = 0;
+    virtual void process(QList<Message> &msgs) = 0;

 
   signals:
 
   protected:
 
   signals:
 
   protected:

-    virtual void processMessage(Message &msg) = 0;
-    virtual void processMessages(QList<Message> &msgs) = 0;
+    void postProcess(Message &msg);

 
 };
 
 
 };
 

diff --git a/src/qtui/qtuimessageprocessor.cpp b/src/qtui/qtuimessageprocessor.cpp
index 54ee570..203397d 100644 (file)
--- a/src/qtui/qtuimessageprocessor.cpp
+++ b/src/qtui/qtuimessageprocessor.cpp
@@ -27,20 +27,42 @@
 #include "network.h"
 
 QtUiMessageProcessor::QtUiMessageProcessor(QObject *parent) : AbstractMessageProcessor(parent) {
 #include "network.h"
 
 QtUiMessageProcessor::QtUiMessageProcessor(QObject *parent) : AbstractMessageProcessor(parent) {

-
-
+  _processing = false;
+  _processMode = TimerBased;
+  _processTimer.setInterval(0);
+  connect(&_processTimer, SIGNAL(timeout()), this, SLOT(processNextMessage()));

 }
 
 }
 

-void QtUiMessageProcessor::processMessage(Message &msg) {
+void QtUiMessageProcessor::process(Message &msg) {

   checkForHighlight(msg);
   Client::messageModel()->insertMessage(msg);
   checkForHighlight(msg);
   Client::messageModel()->insertMessage(msg);

+  postProcess(msg);
+}
+
+void QtUiMessageProcessor::process(QList<Message> &msgs) {
+  _processQueue.append(msgs);
+  if(!isProcessing()) startProcessing();

 }
 
 }
 

-void QtUiMessageProcessor::processMessages(QList<Message> &msgs) {
-  foreach(Message msg, msgs) {
-    checkForHighlight(msg);
-    Client::messageModel()->insertMessage(msg);
+void QtUiMessageProcessor::startProcessing() {
+  if(processMode() == TimerBased) {
+    if(_currentBatch.isEmpty() && _processQueue.isEmpty()) return;
+    _processing = true;
+    if(!_processTimer.isActive()) _processTimer.start();
+  }
+}
+
+void QtUiMessageProcessor::processNextMessage() {
+  if(_currentBatch.isEmpty()) {
+    if(_processQueue.isEmpty()) {
+      _processTimer.stop();
+      _processing = false;
+      return;
+    }
+    _currentBatch = _processQueue.takeFirst();

   }
   }

+  Message msg = _currentBatch.takeFirst();
+  process(msg);

 }
 
 // TODO optimize checkForHighlight
 }
 
 // TODO optimize checkForHighlight

diff --git a/src/qtui/qtuimessageprocessor.h b/src/qtui/qtuimessageprocessor.h
index 161385b..cfbc139 100644 (file)
--- a/src/qtui/qtuimessageprocessor.h
+++ b/src/qtui/qtuimessageprocessor.h
@@ -21,21 +21,39 @@
 #ifndef QTUIMESSAGEPROCESSOR_H_
 #define QTUIMESSAGEPROCESSOR_H_
 
 #ifndef QTUIMESSAGEPROCESSOR_H_
 #define QTUIMESSAGEPROCESSOR_H_
 

+#include <QTimer>
+

 #include "abstractmessageprocessor.h"
 
 class QtUiMessageProcessor : public AbstractMessageProcessor {
   Q_OBJECT
 
   public:
 #include "abstractmessageprocessor.h"
 
 class QtUiMessageProcessor : public AbstractMessageProcessor {
   Q_OBJECT
 
   public:

+    enum Mode {
+      TimerBased,
+      Concurrent
+    };
+

     QtUiMessageProcessor(QObject *parent);
     QtUiMessageProcessor(QObject *parent);

+    inline bool isProcessing() const { return _processing; }
+    inline Mode processMode() const { return _processMode; }

 
 

+  public slots:
+    void process(Message &msg);
+    void process(QList<Message> &msgs);

 
 

-  private:
-    void processMessage(Message &msg);
-    void processMessages(QList<Message> &msgs);
+  private slots:
+    void processNextMessage();

 
 

+  private:

     void checkForHighlight(Message &msg);
     void checkForHighlight(Message &msg);

+    void startProcessing();

 
 

+    QList<QList<Message> > _processQueue;
+    QList<Message> _currentBatch;
+    QTimer _processTimer;
+    bool _processing;
+    Mode _processMode;

 };
 
 #endif
 };
 
 #endif