Changeset 4881 for branches/erijo-dev

Timestamp:

04/01/07 21:44:55 (20 months ago)

Author:

erijo

Message:

Add an eventloop class and make the daemon use it.

Location:

branches/erijo-dev/licq

Files:

• CMakeLists.txt (modified) (2 diffs)
• licq/eventloop.h (added)
• licq/interface/daemon.h (modified) (2 diffs)
• licq/interface/eventhandler.h (added)
• src/CMakeLists.txt (modified) (1 diff)
• src/daemon.cpp (modified) (3 diffs)
• src/daemon.h (modified) (3 diffs)
• src/eventloop.cpp (added)

branches/erijo-dev/licq/CMakeLists.txt

@@ -6 +6 @@
 if (NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Debug CACHE STRING
-    "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel Maintainer."
+    "Choose the type of build, options are: "
+    "None Debug Release RelWithDebInfo MinSizeRel Maintainer."
     FORCE)
 endif (NOT CMAKE_BUILD_TYPE)
@@ -55 +56 @@
 
 # Generate config.h
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
+  ${CMAKE_CURRENT_BINARY_DIR}/config.h
+)
 
 add_subdirectory(src)

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

@@ -21 +21 @@
 #define LICQ_IDAEMON_H
 
+#include "licq/interface/event.h"
+
 #include <string>
 
@@ -35 +37 @@
 
   virtual void* getService(const std::string& name) const = 0;
+  virtual void pushEvent(IEventPtr& event) = 0;
 };
 

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

@@ -2 +2 @@
   daemon.cpp
   event.cpp
+  eventloop.cpp
   eventqueue.cpp
   logfile.cpp

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

@@ -20 +20 @@
 #include "daemon.h"
 
-void Licq::TDaemon::onEvent(IEventPtr& event)
+#include <sys/time.h>
+#include <time.h>
+
+void Licq::TDaemon::onEvent(const IEventPtr& event)
 {
+  Log.info("TDaemon::onEvent(%s)", event->getEventName().c_str());
   TEventHandlers::iterator handler = EventHandlers.find(event->getEventName());
   if (handler != EventHandlers.end())
@@ -30 +34 @@
 }
 
-void Licq::TDaemon::onPluginCreate(IEventPtr& event)
+void Licq::TDaemon::onPluginCreate(const IEventPtr& event)
 {
   std::string name;
   if (event->getProperty("name", &name))
   {
-    // something
+    Log.info("Creating plugin %s", name.c_str());
+  }
+}
+
+void Licq::TDaemon::onTimeout(int timer)
+{
+  static int count = 0;
+  timeval now;
+  ::gettimeofday(&now, NULL);
+  Log.info("Timeout at %ld:%03ld for timer %d", now.tv_sec, now.tv_usec/1000, timer);
+  if (count++ > 10)
+    EventLoop.exit(0);
+
+  if (count % 2)
+  {
+    IEventPtr event = IEvent::create(0, "plugin:create");
+    event->setProperty("name", "testplugin");
+    pushEvent(event);
+
+    event = IEvent::create(0, "invalid:event");
+    pushEvent(event);
+  }
+
+  if (count == 5)
+    Pipe.write("TESTING", sizeof("TESTING") - 1);
+}
+
+void Licq::TDaemon::onFileDescriptor(int fd)
+{
+  if (fd == Pipe.getFileDescriptor())
+  {
+    char buf;
+    Pipe.read(&buf, 1);
+    Log.info("Read %c from pipe", buf);
   }
 }
 
 Licq::TDaemon::TDaemon()
-  : PluginRepository(NULL)
+  : PluginRepository(NULL), EventLoop(&EventQueue, this)
 {
   // Setup event handlers
@@ -68 +105 @@
   Log.debug("Done rebuilding plugin cache.");
 
-  return 0;
+  EventLoop.addTimer(1000, this);
+  EventLoop.addTimer(500, this);
+
+  EventLoop.addFileDescriptor(Pipe.getFileDescriptor(),
+                              TEventLoop::ACTION_READ_FD, this);
+  return EventLoop.run();
 }
 
-void* Licq::TDaemon::getService(const std::string& name) const
+void* Licq::TDaemon::getService(const std::string& /* name */) const
 {
   return NULL;
 }
+
+void Licq::TDaemon::pushEvent(IEventPtr& event)
+{
+  EventQueue.push(event);
+}

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

@@ -22 +22 @@
 
 #include "licq/interface/daemon.h"
+#include "licq/eventloop.h"
 
+#include "eventqueue.h"
 #include "logfile.h"
 #include "plugin/pluginrepository.h"
+#include "utils/pipe.h"
 
 namespace Licq
 {
 
-class TDaemon : public IDaemon
+class TDaemon : public IDaemon,
+                public IEventHandler,
+                public ITimeoutHandler,
+                public IFileDescriptorHandler
 {
 private:
@@ -35 +41 @@
   TLogFile Log;
 
-  typedef void (TDaemon::*FnEventHandler)(IEventPtr& event);
+  TEventQueue EventQueue;
+  TEventLoop EventLoop;
+  TPipe Pipe;
+
+  typedef void (TDaemon::*FnEventHandler)(const IEventPtr& event);
   typedef std::map<std::string, FnEventHandler> TEventHandlers;
   TEventHandlers EventHandlers;
 
-  // Main event dispatcher
-  void onEvent(IEventPtr& event);
+  // From IEventHandler
+  void onEvent(const IEventPtr& event);
 
   // Event handlers
-  void onPluginCreate(IEventPtr& event);
+  void onPluginCreate(const IEventPtr& event);
+
+  // From ITimeoutHandler
+  void onTimeout(int timer);
+
+  // From IFileDescriptorHandler
+  void onFileDescriptor(int fd);
 
 public:
@@ -53 +69 @@
   // From IDaemon
   void* getService(const std::string& name) const;
+  void pushEvent(IEventPtr& event);
 };