Changeset 6026 for branches/newapi

Timestamp:

01/11/08 07:58:30 (11 months ago)

Author:

erijo

Message:

Added some event handling to the daemon

Location:

branches/newapi/licq/src

Files:

• daemon.cpp (modified) (3 diffs)
• daemon.h (modified) (3 diffs)

branches/newapi/licq/src/daemon.cpp

@@ -19 +19 @@
 
 #include "daemon.h"
+#include "event/eventqueue.h"
 #include "event/eventmanager.h"
 #include "event/eventqueuename.h"
 #include "globals.h"
+#include "licq/event/eventdispatcher.h"
+#include "licq/event/eventloop.h"
 #include "licq/exception/invalidargumentexception.h"
 #include "licq/exception/runtimeexception.h"
@@ -92 +95 @@
     myEventManager(eventManager)
 {
-  // Empty
+  myEventLoop = new Licq::EventLoop();
+  myEventQueue = new EventQueue("daemon");
+  myEventDispatcher = new Licq::EventDispatcher(*myEventLoop, *myEventQueue, this);
+
+  myEventManager->registerQueue(EventQueueName::daemon, myEventQueue, 0);
 }
 
 LicqDaemon::Daemon::~Daemon()
 {
-  // Empty
+  myEventManager->unregisterQueue(EventQueueName::daemon, myEventQueue);
+
+  delete myEventDispatcher;
+  delete static_cast<EventQueue*>(myEventQueue);
+  delete myEventLoop;
 }
 
@@ -188 +199 @@
 int LicqDaemon::Daemon::main()
 {
-  sleep(2);
-  return 1;
+  if (myPluginManager->pluginsRunning() == 0)
+  {
+    myLog.warning("No plugins running; exiting");
+    return 1;
+  }
+
+  myEventDispatcher->setDefaultCallback(&Daemon::onEvent, this);
+  myEventDispatcher->setCallback("daemon.exit", &Daemon::onExitEvent, this);
+  myEventDispatcher->setCallback("plugin.stopped", &Daemon::onPluginStopped, this);
+
+  return myEventLoop->run();
+}
+
+bool LicqDaemon::Daemon::onEvent(Licq::Event::Ptr event)
+{
+  myLog.debug() << "Received event " << event->getName();
+  return true;
+}
+
+bool LicqDaemon::Daemon::onExitEvent(Licq::Event::Ptr)
+{
+  myLog.debug() << "Stopping all plugins";
+  myPluginManager->stopAllPlugins();
+  return true;
+}
+
+bool LicqDaemon::Daemon::onPluginStopped(Licq::Event::Ptr event)
+{
+  assert(event->hasProperty("id"));
+  myLog.debug() << "Plugin stopped; id = " << 
+      event->getProperty<Licq::Plugin::Id>("id");
+  myPluginManager->cleanupPlugin(event->getProperty<Licq::Plugin::Id>("id"));
+
+  if (myPluginManager->pluginsRunning() == 0)
+  {
+    myLog.debug() << "All plugins are stopped; exiting";
+    myEventLoop->exit(0);
+  }
+
+  return true;
 }
 

branches/newapi/licq/src/daemon.h

@@ -29 +29 @@
 namespace Licq
 {
+class EventDispatcher;
+class EventLoop;
+class EventQueue;
 class Log;
 }
@@ -52 +55 @@
   const std::string& getBaseDir() const;
 
+  bool onEvent(Licq::Event::Ptr event);
+  bool onExitEvent(Licq::Event::Ptr event);
+  bool onPluginStopped(Licq::Event::Ptr event);
+
   // From Licq::Daemon
   void sendEvent(Licq::Event::Ptr event);
   void sendEventToDaemon(Licq::Event::Ptr event);
   void sendEventToPlugin(Licq::Event::Ptr event, Licq::Plugin::Id id);
-
   void getPluginInformation(Licq::Plugin::InformationVector* info);
 
@@ -63 +69 @@
   PluginManager* myPluginManager;
   EventManager* myEventManager;
+
+  Licq::EventLoop* myEventLoop;
+  Licq::EventQueue* myEventQueue;
+  Licq::EventDispatcher* myEventDispatcher;
 
   std::string myBaseDir;