Changeset 4879 for branches/erijo-dev

Timestamp:

04/01/07 04:09:14 (20 months ago)

Author:

erijo

Message:

Cache plugin information on the heap and pass them around as smart pointers.

Location:

branches/erijo-dev/licq

Files:

• licq/interface/plugininformation.h (modified) (2 diffs)
• src/plugin/pluginrepository.cpp (modified) (3 diffs)
• src/plugin/pluginrepository.h (modified) (2 diffs)

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

@@ -21 +21 @@
 #define LICQ_TPLUGININFORMATION_H
 
+#include <boost/shared_ptr.hpp>
 #include <string>
 #include <vector>
@@ -26 +27 @@
 namespace Licq
 {
+
+class TPluginInformation;
+typedef boost::shared_ptr<const TPluginInformation> TPluginInformationPtr;
 
 enum TPluginType

branches/erijo-dev/licq/src/plugin/pluginrepository.cpp

@@ -65 +65 @@
       entry->Factory = *factory;
       entry->Index = index;
-      entry->Information = (*factory)->getPluginInformation(index);
+      entry->Information
+        .reset(new TPluginInformation((*factory)->getPluginInformation(index)));
+
+      if (entry->Information->Name.empty())
+      {
+        Log->warning("Skipping plugin with no name");
+        delete entry;
+        continue;
+      }
 
       // Check for duplicate plugins
-      TPluginCache::iterator cache = PluginCache.find(entry->Information.Name);
+      TPluginCache::iterator cache = PluginCache.find(entry->Information->Name);
       if (cache != PluginCache.end())
       {
         // Keep the one with the highest IntVersion, or if equal, the first loaded.
-        if (entry->Information.IntVersion <= cache->second->Information.IntVersion)
+        if (entry->Information->IntVersion 
+            <= cache->second->Information->IntVersion)
         {
           delete entry;
@@ -92 +101 @@
 
       // Cache plugin
-      PluginCache[entry->Information.Name] = entry;
+      PluginCache[entry->Information->Name] = entry;
     }
   }
@@ -103 +112 @@
 
 void Licq::TPluginRepository::
-getAvailablePlugins(std::list<TPluginInformation>* pluginInformation)
+getAvailablePlugins(std::list<TPluginInformationPtr>* pluginInformation)
 {
   for (TPluginCache::const_iterator cache = PluginCache.begin();

branches/erijo-dev/licq/src/plugin/pluginrepository.h

@@ -53 +53 @@
     boost::weak_ptr<IPluginFactory> Factory;
     unsigned int Index;
-    TPluginInformation Information;
+    TPluginInformationPtr Information;
   };
 
@@ -70 +70 @@
   void unloadUnusedPlugins();
 
-  void getAvailablePlugins(std::list<TPluginInformation>* pluginInformation);
+  void getAvailablePlugins(std::list<TPluginInformationPtr>* pluginInformation);
 
   IPlugin* createPlugin(const std::string& name);