Changeset 5921 for branches/newapi

Timestamp:

12/03/07 00:37:29 (12 months ago)

Author:

erijo

Message:

Move arguments passed to licqCreatePlugin to the struct Licq::Plugin::Setup.

Location:

branches/newapi/licq

Files:

• licq/interface/plugin.h (modified) (2 diffs)
• src/daemon.cpp (modified) (1 diff)
• src/plugin/plugininstanceimpl.cpp (modified) (5 diffs)
• src/plugin/plugininstanceimpl.h (modified) (3 diffs)
• src/plugin/pluginlibrary.h (modified) (1 diff)
• src/plugin/pluginlibraryimpl.cpp (modified) (1 diff)
• src/plugin/pluginlibraryimpl.h (modified) (2 diffs)
• src/plugin/pluginmanager.h (modified) (1 diff)
• src/plugin/pluginmanagerimpl.cpp (modified) (1 diff)
• src/plugin/pluginmanagerimpl.h (modified) (1 diff)
• src/plugin/test/plugincachetest.cpp (modified) (1 diff)
• src/plugin/test/pluginlibrarytest.cpp (modified) (2 diffs)

branches/newapi/licq/licq/interface/plugin.h

@@ -66 +66 @@
     std::string filename;
   };
+
+  struct Setup
+  {
+    /// An unque id for the plugin instance.
+    Id id;
+
+    /// The log that the plugin should use when logging.
+    Log* log;
+
+    /// Number of arguments in argv. Always >= 1.
+    int argc;
+
+    /**
+     * Arguments passed to the plugin on e.g. the command line. Each
+     * plugin gets their own copy which contains "licq" in argv[0] and
+     * then all arguments passed to this plugin. Note that this is not
+     * the full list of arguments as entered by the user, only those
+     * that apply to this plugin.
+     */
+    char** argv;
+  };
 };
 
@@ -88 +109 @@
    * Creates the plugin.
    *
-   * @param log The log that this plugin should use when logging.
-   *
-   * @param argc Number of arguments in @a argv. Always >= 1.
-   *
-   * @param argv Arguments passed to the plugin on e.g. the command
-   * line. Each plugin gets their own copy which contains "licq" in
-   * argv[0] and then all arguments passed to this plugin. Note that
-   * this is not the full list of arguments as entered by the user,
-   * only those that apply to this plugin.
+   * @param setup Setup data for the plugin.
    *
    * @return The created plugin instance; or, if the creation failed
    * due to e.g. bad arguments, NULL.
    */
-  LICQ_EXPORT Licq::Plugin* licqCreatePlugin(Licq::Log& log, int argc, char** argv);
+  LICQ_EXPORT Licq::Plugin* licqCreatePlugin(const Licq::Plugin::Setup& setup);
 
   /**

branches/newapi/licq/src/daemon.cpp

@@ -182 +182 @@
 int LicqDaemon::Daemon::main()
 {
+  PluginManager::getInstance()->unloadAll();
   return 1;
 }

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

@@ -29 +29 @@
 #include <cstring>
 
-static Licq::Plugin::Id globalPluginId = 0;
-static Licq::Mutex globalPluginIdMutex("globalPluginId");
+static Licq::Plugin::Id getNextPluginId()
+{
+  static Licq::Plugin::Id nextPluginId = 1;
+  static Licq::Mutex nextPluginIdMutex("nextPluginId");
+
+  Licq::MutexLocker locker(&nextPluginIdMutex);
+  return nextPluginId++;
+}
 
 LicqDaemon::PluginInstanceImpl::
@@ -38 +44 @@
   : myInformation(info),
     myLibrary(library),
-    myPluginId(0),
     myPlugin(NULL),
     myThread(NULL),
-    myLogSink(sink),
-    myLog(NULL),
-    myArgc(0),
-    myArgv(NULL)
+    myLogSink(sink)
 {
-  // Empty
+  mySetup.id = 0;
+  mySetup.log = NULL;
+  mySetup.argc = 0;
+  mySetup.argv = 0;
 }
 
@@ -53 +58 @@
   delete myThread;
   myLibrary->destroyPlugin(myPlugin);
-  delete myLog;
 
-  for (int i = 0; i < myArgc; ++i)
-    free(myArgv[i]);
-
-  delete[] myArgv;
+  delete static_cast<Log*>(mySetup.log);
+  for (int i = 0; i < mySetup.argc; ++i)
+    free(mySetup.argv[i]);
+  delete[] mySetup.argv;
 }
 
@@ -66 +70 @@
 
   // Set up argc and argv for the plugin
-  myArgc = argc + 1;
-  myArgv = new char*[myArgc];
+  mySetup.argc = argc + 1;
+  mySetup.argv = new char*[mySetup.argc];
 
-  myArgv[0] = ::strdup("licq");
+  mySetup.argv[0] = ::strdup("licq");
   for (int i = 0; i < argc; ++i)
-    myArgv[i + 1] = ::strdup(argv[i]);
+    mySetup.argv[i + 1] = ::strdup(argv[i]);
 
   // Create the log
-  myLog = new Log(myInformation->name, &myLogSink);
+  mySetup.log = new Log(myInformation->name, &myLogSink);
+
+  // Get a plugin id
+  mySetup.id = getNextPluginId();
 
   // Create the plugin
-  myPlugin = myLibrary->createPlugin(*myLog, myArgc, myArgv);
+  myPlugin = myLibrary->createPlugin(mySetup);
   if (myPlugin == NULL)
   {
@@ -87 +94 @@
   myThread = new Licq::Thread(myPlugin);
 
-  Licq::MutexLocker locker(&globalPluginIdMutex);
-  myPluginId = ++globalPluginId;
-  return myPluginId;
+  return mySetup.id;
 }

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

@@ -21 +21 @@
 #define LICQDAEMON_PLUGININSTANCEIMPL_H
 
+#include "licq/thread/thread.h"
 #include "plugin/plugininstance.h"
 
@@ -72 +73 @@
   boost::shared_ptr<PluginLibrary> myLibrary;
 
-  Licq::Plugin::Id myPluginId;
+  Licq::Plugin::Setup mySetup;
+
   Licq::Plugin* myPlugin;
   Licq::Thread* myThread;
 
   Licq::LogSink& myLogSink;
-  LicqDaemon::Log* myLog;
-
-  int myArgc;
-  char** myArgv;
 };
 
@@ -87 +85 @@
 inline Licq::Plugin::Id LicqDaemon::PluginInstanceImpl::getPluginId() const
 {
-  return myPluginId;
+  return mySetup.id;
 }
 

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

@@ -37 +37 @@
   virtual unsigned int getPluginAbiVersion() = 0;
   virtual void getPluginInformation(Licq::Plugin::Information* info) = 0;
-  virtual Licq::Plugin* createPlugin(Licq::Log& log, int argc, char** argv) = 0;
+  virtual Licq::Plugin* createPlugin(const Licq::Plugin::Setup& setup) = 0;
   virtual void destroyPlugin(Licq::Plugin* plugin) = 0;
 };

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

@@ -41 +41 @@
 
 Licq::Plugin*
-LicqDaemon::PluginLibraryImpl::createPlugin(Licq::Log& log, int argc, char** argv)
+LicqDaemon::PluginLibraryImpl::createPlugin(const Licq::Plugin::Setup& setup)
 {
-  return myCreate(log, argc, argv);
+  return myCreate(setup);
 }
 

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

@@ -55 +55 @@
    * Call the plugin's licqCreatePlugin() function.
    */
-  Licq::Plugin* createPlugin(Licq::Log& log, int argc, char** argv);
+  Licq::Plugin* createPlugin(const Licq::Plugin::Setup& setup);
 
   /**
@@ -67 +67 @@
   unsigned int (*myGetVersion)();
   void (*myGetInformation)(Licq::Plugin::Information*);
-  Licq::Plugin* (*myCreate)(Licq::Log&, int, char**);
+  Licq::Plugin* (*myCreate)(const Licq::Plugin::Setup& setup);
   void (*myDestroy)(Licq::Plugin*);
 };

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

@@ -49 +49 @@
   static PluginManager* getInstance();
 
+  virtual void unloadAll() = 0;
+
   virtual void setPluginLogSink(Licq::LogSink* sink) = 0;
 

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

@@ -32 +32 @@
 {
   // Empty
+}
+
+void LicqDaemon::PluginManagerImpl::unloadAll()
+{
+  myPlugins.clear();
+  myCache.clear();
+  myCache.unloadUnusedLibraries();
 }
 

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

@@ -40 +40 @@
   ~PluginManagerImpl();
 
+  void unloadAll();
+
   /**
    * Set the LogSink that plugins will log to. This must have been

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

@@ -79 +79 @@
   }
 
-  Licq::Plugin* createPlugin(Licq::Log& /*log*/, int /*argc*/, char** /*argv*/)
+  Licq::Plugin* createPlugin(const Licq::Plugin::Setup& /*setup*/)
   {
     return NULL;

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

@@ -53 +53 @@
 }
 
-Licq::Plugin* licqCreatePlugin(Licq::Log&, int argc, char** argv)
+Licq::Plugin* licqCreatePlugin(const Licq::Plugin::Setup& setup)
 {
-  BOOST_CHECK_EQUAL(argc, 1);
-  BOOST_CHECK_EQUAL(argv[0], "licq");
+  BOOST_CHECK_EQUAL(setup.argc, 1);
+  BOOST_CHECK_EQUAL(setup.argv[0], "licq");
 
   static FakePlugin plugin;
-  plugin.myArgc = argc;
-  plugin.myArgv = argv;
+  plugin.myArgc = setup.argc;
+  plugin.myArgv = setup.argv;
   plugin.myDestroyed = false;
   return (Licq::Plugin*)&plugin;
@@ -105 +105 @@
 BOOST_AUTO_TEST_CASE(createDestroy)
 {
-  Licq::Log* log = Licq::Log::getThreadLog();
   const char* argv[] = { "licq" };
-  FakePlugin* plugin = (FakePlugin*)myLib.createPlugin(*log, 1, (char**)argv);
+
+  Licq::Plugin::Setup setup;
+  setup.log = Licq::Log::getThreadLog();
+  setup.argc = 1;
+  setup.argv = (char**)argv;
+
+  FakePlugin* plugin = (FakePlugin*)myLib.createPlugin(setup);
   BOOST_CHECK_EQUAL(plugin->myArgc, 1);
   BOOST_CHECK_EQUAL(plugin->myArgv, (char**)argv);