erasure-code: implement ErasureCodePluginRegistry::remove

Which is symmetric to the add method and used for test.

Signed-off-by: Loic Dachary <loic-201408@dachary.org>

diff --git a/src/erasure-code/ErasureCodePlugin.cc b/src/erasure-code/ErasureCodePlugin.cc
index 16e21b011a0eed6a5faa0c6d7d5f3f18e8317118..fa3dec02bcc629f9350f3b95d2759b7f7852c63c 100644 (file)
--- a/src/erasure-code/ErasureCodePlugin.cc
+++ b/src/erasure-code/ErasureCodePlugin.cc
@@ -49,6 +49,18 @@ ErasureCodePluginRegistry::~ErasureCodePluginRegistry()
   }
 }
 
+int ErasureCodePluginRegistry::remove(const std::string &name)
+{
+  if (plugins.find(name) == plugins.end())
+    return -ENOENT;
+  std::map<std::string,ErasureCodePlugin*>::iterator plugin = plugins.find(name);
+  void *library = plugin->second->library;
+  delete plugin->second;
+  dlclose(library);
+  plugins.erase(plugin);
+  return 0;
+}
+
 int ErasureCodePluginRegistry::add(const std::string &name,
                                    ErasureCodePlugin* plugin)
 {

diff --git a/src/erasure-code/ErasureCodePlugin.h b/src/erasure-code/ErasureCodePlugin.h
index 30ced6c12a37ced6026f7ce1f3a5910fba45ef59..3348eacc425b2d2a17fa32901043ee5e8da86d48 100644 (file)
--- a/src/erasure-code/ErasureCodePlugin.h
+++ b/src/erasure-code/ErasureCodePlugin.h
@@ -61,6 +61,7 @@ namespace ceph {
                ostream &ss);
 
     int add(const std::string &name, ErasureCodePlugin *plugin);
+    int remove(const std::string &name);
     ErasureCodePlugin *get(const std::string &name);
 
     int load(const std::string &plugin_name,

diff --git a/src/test/erasure-code/TestErasureCodePlugin.cc b/src/test/erasure-code/TestErasureCodePlugin.cc
index 2755044d47f42115eec66ec53a8f81d3313e7d03..e9ffaa2c7dc96afdcef5819c6c764c2a7baa326d 100644 (file)
--- a/src/test/erasure-code/TestErasureCodePlugin.cc
+++ b/src/test/erasure-code/TestErasureCodePlugin.cc
@@ -94,6 +94,9 @@ TEST_F(ErasureCodePluginRegistryTest, all)
   EXPECT_TRUE(erasure_code);
   ErasureCodePlugin *plugin = 0;
   EXPECT_EQ(-EEXIST, instance.load("example", directory, &plugin, ss));
+  EXPECT_EQ(-ENOENT, instance.remove("does not exist"));
+  EXPECT_EQ(0, instance.remove("example"));
+  EXPECT_EQ(0, instance.load("example", directory, &plugin, ss));
 }
 
 int main(int argc, char **argv) {