Changeset 4884 for branches/erijo-dev

Timestamp:

04/05/07 03:04:10 (20 months ago)

Author:

erijo

Message:

Add a class for dispatching events to handlers and make the daemon use it.

Location:

branches/erijo-dev/licq

Files:

• licq/eventdispatcher.h (added)
• src/daemon.cpp (modified) (3 diffs)
• src/daemon.h (modified) (3 diffs)
• src/event/CMakeLists.txt (modified) (1 diff)
• src/event/eventdispatcher.cpp (added)

branches/erijo-dev/licq/src/daemon.cpp

@@ -23 +23 @@
 #include <time.h>
 
+void aEventHandler(const Licq::IEventPtr& event)
+{
+  Licq::ILog* log;
+  int count;
+  if (event->getProperty("ILog", &log) && event->getProperty("count", &count))
+  {
+    log->info("in aEventHandler with event #%lu and count %d", 
+              event->getId(), count);
+  }
+}
+
 void Licq::TDaemon::onEvent(const IEventPtr& event)
 {
   Log.info("TDaemon::onEvent(%s [%lu])", event->getName().c_str(), event->getId());
-  TEventHandlers::iterator handler = EventHandlers.find(event->getName());
-  if (handler != EventHandlers.end())
-  {
-    Log.debug("Calling handler for %s", event->getName().c_str());
-    (this->*(handler->second))(event);
-  }
 }
 
@@ -60 +65 @@
     event = IEvent::create(0, "invalid:event");
     pushEvent(event);
+
+    event = IEvent::create(0, "log:event");
+    event->setProperty("ILog", (Licq::ILog*)&Log);
+    event->setProperty("count", count);
+    pushEvent(event);
   }
 
@@ -83 +93 @@
 
 Licq::TDaemon::TDaemon()
-  : PluginRepository(NULL), EventLoop(&EventQueue, this)
+  : PluginRepository(NULL), EventLoop(&EventQueue, &EventDispatcher)
 {
   // Setup event handlers
-  EventHandlers["plugin:create"] = &TDaemon::onPluginCreate;
+  EventDispatcher.setDefaultCallback(&TDaemon::onEvent, this);
+  EventDispatcher.setCallback("plugin:create", &TDaemon::onPluginCreate, this);
+  EventDispatcher.setCallback("log:event", &aEventHandler);
 }
 

branches/erijo-dev/licq/src/daemon.h

@@ -22 +22 @@
 
 #include "licq/interface/daemon.h"
+#include "licq/eventdispatcher.h"
 #include "licq/eventloop.h"
 
@@ -33 +34 @@
 
 class TDaemon : public IDaemon,
-                public IEventHandler,
                 public ITimeoutHandler,
                 public IFileDescriptorHandler
@@ -43 +43 @@
   TEventQueue EventQueue;
   TEventLoop EventLoop;
+  TEventDispatcher EventDispatcher;
   TPipe Pipe;
 
-  typedef void (TDaemon::*FnEventHandler)(const IEventPtr& event);
-  typedef std::map<std::string, FnEventHandler> TEventHandlers;
-  TEventHandlers EventHandlers;
-
-  // From IEventHandler
+  // Event handlers
   void onEvent(const IEventPtr& event);
-
-  // Event handlers
   void onPluginCreate(const IEventPtr& event);
 

branches/erijo-dev/licq/src/event/CMakeLists.txt

@@ -1 +1 @@
 set(event_SRCS
   event.cpp
+  eventdispatcher.cpp
   eventloop.cpp
   eventqueue.cpp