Changeset 5952 for branches/newapi

Timestamp:

12/11/07 06:18:18 (12 months ago)

Author:

erijo

Message:

Started working on EventManager?.

Location:

branches/newapi/licq

Files:

• licq/event/eventqueue.h (modified) (1 diff)
• src/event/CMakeLists.txt (modified) (1 diff)
• src/event/eventmanager.h (added)
• src/event/eventmanagerimpl.cpp (added)
• src/event/eventmanagerimpl.h (added)
• src/event/eventqueue.cpp (modified) (4 diffs)
• src/event/eventqueue.h (modified) (3 diffs)
• src/event/test/eventqueuetest.cpp (modified) (2 diffs)
• src/globals.cpp (modified) (4 diffs)
• src/globals.h (modified) (3 diffs)
• src/plugin/plugininstanceimpl.cpp (modified) (2 diffs)

branches/newapi/licq/licq/event/eventqueue.h

@@ -46 +46 @@
 
   /**
+   * Pushes an event to the end of the queue. The queue takes
+   * ownership of the event and @a event is reset before the function
+   * returns.
+   */
+  virtual void pushEvent(boost::shared_ptr<Event>& event) = 0;
+
+  /**
    * @returns The event in the front of the queue.
    * @throws Licq::RuntimeException If the queue is empty.

branches/newapi/licq/src/event/CMakeLists.txt

@@ -2 +2 @@
   descriptorset.cpp
   event.cpp
+  eventhandler.cpp
   eventloop.cpp
+  eventmanagerimpl.cpp
   eventqueue.cpp
   timerset.cpp

branches/newapi/licq/src/event/eventqueue.cpp

@@ -25 +25 @@
 #include <cassert>
 
-LicqDaemon::EventQueue::EventQueue(const std::string& name)
+LicqDaemon::EventQueue::EventQueue(const std::string& name, EventManager* manager)
   : myName(name),
+    myEventManager(manager),
     myQueueMutex(name),
     myPipe(name)
 {
+  assert(myEventManager != NULL);
+
   myPipe.setBlockingRead(false);
   myPipe.setBlockingWrite(true);
@@ -39 +42 @@
   while (!myQueue.empty())
     commitEventInternal();
+}
+
+int LicqDaemon::EventQueue::getFileDescriptor() const
+{
+  return myPipe.getReadFd();
+}
+
+bool LicqDaemon::EventQueue::empty() const
+{
+  Licq::MutexLocker locker(&myQueueMutex);
+  return myQueue.empty();
 }
 
@@ -54 +68 @@
   // Notify
   myPipe.putc('E');
-}
-
-int LicqDaemon::EventQueue::getFileDescriptor() const
-{
-  return myPipe.getReadFd();
-}
-
-bool LicqDaemon::EventQueue::empty() const
-{
-  Licq::MutexLocker locker(&myQueueMutex);
-  return myQueue.empty();
 }
 
@@ -90 +93 @@
   myQueue.pop();
 
-  // TODO: something with event
+  myEventManager->sendEvent(event);
 }

branches/newapi/licq/src/event/eventqueue.h

@@ -23 +23 @@
 #include "licq/event/eventqueue.h"
 #include "licq/thread/mutex.h"
+#include "event/eventmanager.h"
 #include "util/pipe.h"
 
@@ -33 +34 @@
 {
 public:
-  EventQueue(const std::string& name);
+  EventQueue(const std::string& name, EventManager* manager);
   ~EventQueue();
-
-  void pushEvent(boost::shared_ptr<Licq::Event>& event);
 
   // From Licq::EventQueue
   int getFileDescriptor() const;
+  void pushEvent(boost::shared_ptr<Licq::Event>& event);
   bool empty() const;
   boost::shared_ptr<Licq::Event> getEvent() const;
@@ -48 +48 @@
 
   const std::string myName;
+  EventManager* myEventManager;
 
   typedef std::queue< boost::shared_ptr<Licq::Event> > Queue;

branches/newapi/licq/src/event/test/eventqueuetest.cpp

@@ -18 +18 @@
  */
 
+#include "event/eventmanager.h"
 #include "event/eventqueue.h"
+#include "test/recorder.h"
 
 #include <boost/test/unit_test.hpp>
+#include <cassert>
 
-BOOST_AUTO_TEST_SUITE(EventQueue)
-// BOOST_FIXTURE_TEST_SUITE(EventQueue, EventQueueFixture)
+struct EventQueueFixture : public LicqDaemon::EventManager
+{
+  void reset()
+  {
+    BOOST_REQUIRE(recorder.isEmpty());
+  }
+
+  // EventManager
+  void registerQueue(const std::string&, Licq::EventQueue*, int)
+  {
+    assert(false);
+  }
+
+  void unregisterQueue(const std::string&, Licq::EventQueue*)
+  {
+    assert(false);
+  }
+
+  void unregisterQueue(Licq::EventQueue*)
+  {
+    assert(false);
+  }
+
+  void sendEvent(boost::shared_ptr<Licq::Event>& event)
+  {
+    recorder.push(boost::format("sendEvent(%1%)") % event->getId());
+  }
+
+  LicqTest::Recorder recorder;
+};
+
+BOOST_FIXTURE_TEST_SUITE(EventQueue, EventQueueFixture)
 
 BOOST_AUTO_TEST_CASE(basic)
 {
-  LicqDaemon::EventQueue queue("test");
+  reset();
+
+  LicqDaemon::EventQueue queue("test", this);
   boost::shared_ptr<Licq::Event> test = Licq::Event::create("test");
   Licq::Event* testPtr = test.get();
+  Licq::Event::Id id = test->getId();
 
   queue.pushEvent(test);
@@ -40 +76 @@
   queue.commitEvent();
   BOOST_CHECK_EQUAL(queue.empty(), true);
+
+  BOOST_CHECK(recorder.pop(boost::format("sendEvent(%1%)") % id));
+  BOOST_CHECK(recorder.isEmpty());
 }
 

branches/newapi/licq/src/globals.cpp

@@ -19 +19 @@
 
 #include "daemon.h"
+#include "event/eventmanagerimpl.h"
 #include "globals.h"
 #include "plugin/plugincacheimpl.h"
@@ -48 +49 @@
 }
 
+LicqDaemon::EventManager* LicqDaemon::Globals::getEventManager()
+{
+  return getInstance()->myEventManager;
+}
+
 LicqDaemon::Globals* LicqDaemon::Globals::getInstance()
 {
@@ -67 +73 @@
   myPluginCache = new PluginCacheImpl(*myPluginLoader);
   myPluginManager = new PluginManagerImpl(*myPluginCache, *myLogDistributor);
+
+  // EventManager
+  myEventManager = new EventManagerImpl();
 
   // Create Daemon
@@ -88 +97 @@
   myDaemon = NULL;
 
+  delete static_cast<EventManagerImpl*>(myEventManager);
+  myEventManager = NULL;
+
   delete static_cast<PluginManagerImpl*>(myPluginManager);
   myPluginManager = NULL;

branches/newapi/licq/src/globals.h

@@ -35 +35 @@
 
 class Daemon;
+class EventManager;
 class Log;
 class LogDistributor;
@@ -61 +62 @@
    * to receive log messages.
    */
-  static LicqDaemon::LogDistributor* getLogDistributor();
+  static LogDistributor* getLogDistributor();
 
   /**
    * @returns The Daemon instance.
    */
-  static LicqDaemon::Daemon* getDaemon();
+  static Daemon* getDaemon();
 
   /**
    * @returns The PluginManager instance.
    */
-  static LicqDaemon::PluginManager* getPluginManager();
+  static PluginManager* getPluginManager();
+
+  /**
+   * @returns The EventManager instance.
+   */
+  static EventManager* getEventManager();
 
 private:
@@ -95 +101 @@
 
   Daemon* myDaemon;
+  EventManager* myEventManager;
   class PluginLoader* myPluginLoader;
   class PluginCache* myPluginCache;

branches/newapi/licq/src/plugin/plugininstanceimpl.cpp

@@ -18 +18 @@
  */
 
+#include "globals.h"
 #include "licq/exception/runtimeexception.h"
 #include "licq/thread/mutex.h"
@@ -93 +94 @@
 
   // Create the plugin's event queue
-  mySetup.eventQueue = new EventQueue(myInformation->name);
+  mySetup.eventQueue = new EventQueue(myInformation->name,
+                                      Globals::getEventManager());
 
   // Create the plugin