Changeset 5909 for branches/newapi

Timestamp:

12/02/07 20:06:43 (12 months ago)

Author:

erijo

Message:

Made PluginManager? a singleton.

Location:

branches/newapi/licq/src

Files:

• CMakeLists.txt (modified) (1 diff)
• daemon.cpp (modified) (6 diffs)
• daemon.h (modified) (1 diff)
• plugin/plugincache.h (modified) (2 diffs)
• plugin/plugincacheimpl.cpp (modified) (3 diffs)
• plugin/plugincacheimpl.h (modified) (3 diffs)
• plugin/pluginmanager.h (modified) (3 diffs)
• plugin/pluginmanagerimpl.h (modified) (3 diffs)
• plugin/test/plugincachetest.cpp (modified) (2 diffs)

branches/newapi/licq/src/CMakeLists.txt

@@ -2 +2 @@
   daemon.cpp
   main.cpp
+  static.cpp
 
 #   backgroundcodes.c

branches/newapi/licq/src/daemon.cpp

@@ -23 +23 @@
 #include "licq/exception/unixexception.h"
 #include "licq/version.h"
-#include "plugin/plugincacheimpl.h"
-#include "plugin/pluginloaderimpl.h"
-#include "plugin/pluginmanagerimpl.h"
+#include "plugin/plugincache.h"
+#include "plugin/pluginmanager.h"
 #include "util/streamlogsink.h"
 #include "util/support.h"
@@ -91 +90 @@
   : myLog(*Log::getThreadLog())
 {
-  myPluginLoader = new PluginLoaderImpl();
-  myPluginCache = new PluginCacheImpl(myLog, *myPluginLoader);
-  myPluginManager = new PluginManagerImpl(*myPluginCache);
+  // Empty
 }
 
 LicqDaemon::Daemon::~Daemon()
 {
-  delete myPluginManager;
-  delete myPluginCache;
-  delete myPluginLoader;
+  // Empty
 }
 
@@ -204 +199 @@
   std::vector< boost::shared_ptr<const Licq::Plugin::Information> >* info)
 {
-  myPluginManager->getPluginInformation(info);
+  PluginManager::getInstance()->getPluginInformation(info);
 }
 
@@ -241 +236 @@
 void LicqDaemon::Daemon::setupDefaultPluginPaths(bool reload)
 {
-  myPluginCache->addSearchPath(myBaseDir + ".plugins/");
+  PluginCache* cache = PluginManager::getInstance()->getPluginCache();
+  cache->addSearchPath(myBaseDir + ".plugins/");
 
   if (reload)
-    myPluginCache->reload();
+    cache->reload();
 }
 
@@ -251 +247 @@
   setupDefaultPluginPaths(false);
 
+  PluginCache* cache = PluginManager::getInstance()->getPluginCache();
   for (std::vector<std::string>::const_iterator it = paths.begin();
        it != paths.end(); ++it)
   {
-    myPluginCache->addSearchPath(*it);
-  }
-
-  myPluginCache->reload();
+    cache->addSearchPath(*it);
+  }
+
+  cache->reload();
 }
 
 void LicqDaemon::Daemon::printAvailablePlugins(std::ostream& os) const
 {
-  const size_t size = myPluginCache->getSize();
+  PluginCache* cache = PluginManager::getInstance()->getPluginCache();
+
+  const size_t size = cache->getSize();
   if (size == 0)
   {
-    os << "No plugins found.\n";
+    os << tr("No plugins found.") << "\n";
     return;
   }
@@ -272 +271 @@
   {
     boost::shared_ptr<const Licq::Plugin::Information> info =
-        myPluginCache->getInformation(i);
+        cache->getInformation(i);
 
     if (i != 0)

branches/newapi/licq/src/daemon.h

@@ -52 +52 @@
 
 private:
-  Log& myLog;
-
-  class PluginLoader* myPluginLoader;
-  class PluginCache* myPluginCache;
-  class PluginManager* myPluginManager;
+  Licq::Log& myLog;
 
   std::string myBaseDir;

branches/newapi/licq/src/plugin/plugincache.h

@@ -37 +37 @@
 {
 public:
-  virtual ~PluginCache() {}
-
   virtual bool addSearchPath(const std::string& path) = 0;
   virtual void reload() = 0;
@@ -50 +48 @@
   virtual boost::shared_ptr<const Licq::Plugin::Information>
       getInformation(size_t index) = 0;
+
+protected:
+  virtual ~PluginCache() { /* Empty */ }
 };
 

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

@@ -25 +25 @@
 #include "plugin/pluginlibrary.h"
 #include "plugin/pluginloader.h"
+#include "util/log.h"
 #include "util/support.h"
 #include "util/tr.h"
@@ -102 +103 @@
 }
 
-LicqDaemon::PluginCacheImpl::PluginCacheImpl(Licq::Log& log,
-                                             PluginLoader& loader,
+LicqDaemon::PluginCacheImpl::PluginCacheImpl(PluginLoader& loader,
                                              bool testMode)
-  : myLog(log), myLoader(loader), myInTestMode(testMode)
+  : myLog(*Log::getThreadLog()),
+    myLoader(loader),
+    myInTestMode(testMode)
 {
   // Empty
@@ -225 +227 @@
     catch (const bfs::filesystem_error&)
     {
-    // Empty
+      // Empty
     }
   }

branches/newapi/licq/src/plugin/plugincacheimpl.h

@@ -21 +21 @@
 #define LICQDAEMON_PLUGINCACHEIMPL_H
 
-#include "licq/interface/log.h"
 #include "plugin/plugincache.h"
 
@@ -48 +47 @@
    * @param[in] loader The PluginLoader to use to load plugins.
    */
-  PluginCacheImpl(Licq::Log& log, PluginLoader& loader, bool testMode = false);
+  PluginCacheImpl(PluginLoader& loader, bool testMode = false);
 
   /**
@@ -145 +144 @@
   void clearCache();
 
-  Licq::Log& myLog;
+  class Licq::Log& myLog;
   PluginLoader& myLoader;
   const bool myInTestMode;

branches/newapi/licq/src/plugin/pluginmanager.h

@@ -23 +23 @@
 #include "licq/interface/plugin.h"
 
+#include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
 #include <vector>
@@ -34 +35 @@
 {
 
+class PluginCache;
+
 /**
  * An abstract interface to ease unit testing. Please refer to
  * PluginManagerImpl for the real documentation.
  */
-class PluginManager
+class PluginManager : private boost::noncopyable
 {
 public:
-  virtual ~PluginManager() {}
+  /**
+   * @returns The PluginManager singleton.
+   */
+  static PluginManager* getInstance();
 
   virtual void getPluginInformation(
@@ -50 +56 @@
              Licq::LogSink& sink,
              int argc, char** argv) = 0;
+
+  virtual PluginCache* getPluginCache() const = 0;
+
+protected:
+  virtual ~PluginManager() { /* Empty */ }
 };
 

branches/newapi/licq/src/plugin/pluginmanagerimpl.h

@@ -28 +28 @@
 {
 
-class PluginCache;
 class PluginInstance;
 
@@ -48 +47 @@
                               int argc, char** argv);
 
+  /**
+   * @returns The plugin cache used.
+   */
+  PluginCache* getPluginCache() const;
+
 private:
   PluginCache& myCache;
@@ -58 +62 @@
 } // namespace LicqDaemon
 
+inline LicqDaemon::PluginCache*
+LicqDaemon::PluginManagerImpl::getPluginCache() const
+{
+  return &myCache;
+}
+
 #endif

branches/newapi/licq/src/plugin/test/plugincachetest.cpp

@@ -25 +25 @@
 #include "plugin/pluginlibrary.h"
 #include "plugin/pluginloader.h"
-#include "test/log.h"
 
 #include <boost/filesystem/operations.hpp>
@@ -125 +124 @@
 struct PluginCacheFixture
 {
-  PluginCacheFixture() : myCache(myLog, myLoader, true) {}
-  Log myLog;
+  PluginCacheFixture() : myCache(myLoader, true) {}
   MockPluginLoader myLoader;
   LicqDaemon::PluginCacheImpl myCache;