Changeset 4873 for branches/erijo-dev

Timestamp:

03/20/07 05:38:00 (21 months ago)

Author:

erijo

Message:

Don't keep libraries loaded if no plugins are used from it.

Files:

• branches/erijo-dev/licq/src/plugin/pluginrepository.cpp (modified) (2 diffs)

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

@@ -40 +40 @@
 void Licq::TPluginRepository::rebuildCache()
 {
-  // Remove all old factories
-  PluginFactories.clear();
+  TPluginFactories factories;
 
   for (TStringList::const_iterator path = PluginPaths.begin();
        path != PluginPaths.end(); ++path)
   {
-    const unsigned int count = PluginLoader.loadPlugins(*path, &PluginFactories);
+    const unsigned int count = PluginLoader.loadPlugins(*path, &factories);
     Log->debug("Loaded %u plugin%s from %s",
                count, (count == 1 ? "" : "s"), path->c_str());
   }
 
-  // Clear the cache
+  // Remove old factories and clear cache
+  PluginFactories.clear();
   std::for_each(PluginCache.begin(), PluginCache.end(), ObjectDeleter());
 
-  for (TPluginFactories::const_iterator factory = PluginFactories.begin();
-       factory != PluginFactories.end(); ++factory)
+  for (TPluginFactories::const_iterator factory = factories.begin();
+       factory != factories.end(); ++factory)
   {
+    bool factorySaved = false;
     const unsigned int count = (*factory)->getPluginCount();
     for (unsigned int index = 0; index < count; ++index)
@@ -83 +84 @@
       }
 
+      // Save factory if it hasn't already been saved.
+      if (!factorySaved)
+      {
+        PluginFactories.push_back(*factory);
+        factorySaved = true;
+      }
+
+      // Cache plugin
       PluginCache[entry->Information.Name] = entry;
     }