Changeset 6018 for branches/newapi

Timestamp:

01/11/08 05:32:54 (11 months ago)

Author:

erijo

Message:

Fixed code to compile with previous commits. Extended Licq::Daemon with methods for sending events.

Location:

branches/newapi/licq

Files:

• licq/interface/daemon.h (modified) (2 diffs)
• src/daemon.cpp (modified) (8 diffs)
• src/daemon.h (modified) (3 diffs)
• src/globals.cpp (modified) (1 diff)

branches/newapi/licq/licq/interface/daemon.h

@@ -21 +21 @@
 #define LICQ_DAEMON_H
 
+#include "licq/event/event.h"
 #include "licq/interface/plugin.h"
 #include "licq/macros.h"
@@ -39 +40 @@
   static Daemon* getInstance();
 
-  virtual void getPluginInformation(
-    std::vector< boost::shared_ptr<const Licq::Plugin::Information> >* info) = 0;
+  virtual void sendEvent(Event::Ptr event) = 0;
+  virtual void sendEventToDaemon(Event::Ptr event) = 0;
+  virtual void sendEventToPlugin(Event::Ptr event, Plugin::Id id) = 0;
+
+  virtual void getPluginInformation(Plugin::InformationVector* info) = 0;
 
 protected:

branches/newapi/licq/src/daemon.cpp

@@ -19 +19 @@
 
 #include "daemon.h"
+#include "event/eventmanager.h"
+#include "event/eventqueuename.h"
 #include "globals.h"
 #include "licq/exception/invalidargumentexception.h"
@@ -83 +85 @@
 }
 
-LicqDaemon::Daemon::Daemon()
-  : myLog(Globals::getDaemonLog())
+LicqDaemon::Daemon::Daemon(Licq::Log& log,
+                           PluginManager* pluginManager,
+                           EventManager* eventManager)
+  : myLog(log),
+    myPluginManager(pluginManager),
+    myEventManager(eventManager)
 {
   // Empty
@@ -167 +173 @@
   if (vm.count("plugin"))
   {
-    PluginManager* pluginManager = Globals::getPluginManager();
-
     std::vector<std::string>
         plugins = vm["plugin"].as< std::vector<std::string> >();
@@ -174 +178 @@
          it != plugins.end(); ++it)
     {
-      Licq::Plugin::Id id = pluginManager->loadPlugin(*it, 0, NULL);
-      myLog.debug(tr("Loaded plugin %1% with id %2%") % *it % id);
+      Licq::Plugin::Id id = myPluginManager->startPlugin(*it, 0, NULL);
+      myLog.debug(tr("Started plugin %1% with id %2%") % *it % id);
     }
   }
@@ -188 +192 @@
 }
 
-void LicqDaemon::Daemon::getPluginInformation(
-  std::vector< boost::shared_ptr<const Licq::Plugin::Information> >* info)
-{
-  Globals::getPluginManager()->getPluginInformation(info);
+void LicqDaemon::Daemon::sendEvent(Licq::Event::Ptr event)
+{
+  myEventManager->sendEvent(event->getName(), event);
+}
+
+void LicqDaemon::Daemon::sendEventToDaemon(Licq::Event::Ptr event)
+{
+  myEventManager->sendEvent(EventQueueName::daemon, event);
+}
+
+void LicqDaemon::Daemon::sendEventToPlugin(Licq::Event::Ptr event,
+                                           Licq::Plugin::Id id)
+{
+  myEventManager->sendEvent(EventQueueName::getPluginPrivate(id), event);
+}
+
+void LicqDaemon::Daemon::
+getPluginInformation(Licq::Plugin::InformationVector* info)
+{
+  myPluginManager->getPluginInformation(info);
 }
 
@@ -228 +248 @@
 void LicqDaemon::Daemon::setupDefaultPluginPaths(bool reload)
 {
-  PluginCache* cache = Globals::getPluginManager()->getPluginCache();
+  PluginCache* cache = myPluginManager->getPluginCache();
   cache->addSearchPath(myBaseDir + "plugins/");
 
@@ -239 +259 @@
   setupDefaultPluginPaths(false);
 
-  PluginCache* cache = Globals::getPluginManager()->getPluginCache();
+  PluginCache* cache = myPluginManager->getPluginCache();
   for (std::vector<std::string>::const_iterator it = paths.begin();
        it != paths.end(); ++it)
@@ -251 +271 @@
 void LicqDaemon::Daemon::printAvailablePlugins(std::ostream& os) const
 {
-  PluginCache* cache = Globals::getPluginManager()->getPluginCache();
+  PluginCache* cache = myPluginManager->getPluginCache();
 
   const size_t size = cache->getSize();

branches/newapi/licq/src/daemon.h

@@ -27 +27 @@
 #include <vector>
 
+namespace Licq
+{
+class Log;
+}
+
 namespace LicqDaemon
 {
 
+class EventManager;
+class PluginManager;
 class StreamLogSink;
 
@@ -37 +44 @@
   static Daemon* getInstance();
 
-  Daemon();
+  Daemon(Licq::Log& log, PluginManager* pluginManager, EventManager* eventManager);
   ~Daemon();
 
@@ -45 +52 @@
   const std::string& getBaseDir() const;
 
-  void getPluginInformation(
-    std::vector< boost::shared_ptr<const Licq::Plugin::Information> >* info);
+  // 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);
 
 private:
-  class Licq::Log& myLog;
+  Licq::Log& myLog;
+  PluginManager* myPluginManager;
+  EventManager* myEventManager;
 
   std::string myBaseDir;

branches/newapi/licq/src/globals.cpp

@@ -69 +69 @@
   myDaemonLog = new Log("licq", myLogDistributor);
 
+  // EventManager
+  myEventManager = new EventManagerImpl();
+
   // Create and configure PluginManager
   myPluginLoader = new PluginLoaderImpl();
   myPluginCache = new PluginCacheImpl(*myPluginLoader);
-  myPluginManager = new PluginManagerImpl(*myPluginCache, *myLogDistributor);
-
-  // EventManager
-  myEventManager = new EventManagerImpl();
+  myPluginManager = 
+      new PluginManagerImpl(*myEventManager, *myPluginCache, *myLogDistributor);
 
   // Create Daemon
-  myDaemon = new Daemon();
+  myDaemon = new Daemon(*myDaemonLog, myPluginManager, myEventManager);
 }