erasure-code: allow loading a plugin from factory()

The Mutex scope is restricted to only protect the load() method and not
the factory() method. This allows a plugin to load another plugin from
within the factory() method.

Reviewed-By: Christophe Courtaut <christophe.courtaut@gmail.com>
Signed-off-by: Loic Dachary <loic@dachary.org>

diff --git a/src/erasure-code/ErasureCodePlugin.cc b/src/erasure-code/ErasureCodePlugin.cc
index a76d6140ccab9cab2f63df914c3340b658a37ffa..63494415de6f9543f3f251b2558e18b0b47de6e1 100644 (file)
--- a/src/erasure-code/ErasureCodePlugin.cc
+++ b/src/erasure-code/ErasureCodePlugin.cc
@@ -68,15 +68,18 @@ int ErasureCodePluginRegistry::factory(const std::string &plugin_name,
                                       ErasureCodeInterfaceRef *erasure_code,
                                       ostream &ss)
 {
-  Mutex::Locker l(lock);
-  ErasureCodePlugin *plugin = get(plugin_name);
-  if (plugin == 0) {
+  ErasureCodePlugin *plugin;
+  {
+    Mutex::Locker l(lock);
     int r = 0;
-    loading = true;
-    r = load(plugin_name, parameters, &plugin, ss);
-    loading = false;
-    if (r != 0)
-      return r;
+    plugin = get(plugin_name);
+    if (plugin == 0) {
+      loading = true;
+      r = load(plugin_name, parameters, &plugin, ss);
+      loading = false;
+      if (r != 0)
+       return r;
+    }
   }
 
   return plugin->factory(parameters, erasure_code);