osd: conditionally disable dlclose of erasure code plugins

When profiling, tools such as valgrind --tool=callgrind require that the
dynamically loaded libraries are not dlclosed so they can collect usage
information.

The public ErasureCodePluginRegistry::disable_dlclose boolean is introduced
for this purpose.

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

diff --git a/src/osd/ErasureCodePlugin.cc b/src/osd/ErasureCodePlugin.cc
index 5d0b6904e1ea2035bc31221ad20acf7fa5046be9..d31b197391e2680ae955cc08176ef2d4255740c5 100644 (file)
--- a/src/osd/ErasureCodePlugin.cc
+++ b/src/osd/ErasureCodePlugin.cc
@@ -37,12 +37,16 @@ ErasureCodePluginRegistry ErasureCodePluginRegistry::singleton;
 
 ErasureCodePluginRegistry::ErasureCodePluginRegistry() :
   lock("ErasureCodePluginRegistry::lock"),
-  loading(false)
+  loading(false),
+  disable_dlclose(false)
 {
 }
 
 ErasureCodePluginRegistry::~ErasureCodePluginRegistry()
 {
+  if (disable_dlclose)
+    return;
+
   for (std::map<std::string,ErasureCodePlugin*>::iterator i = plugins.begin();
        i != plugins.end();
        ++i) {

diff --git a/src/osd/ErasureCodePlugin.h b/src/osd/ErasureCodePlugin.h
index a2feb71695aba59b80327ab651de19f944a7c8c9..1f5e46c6d276b8c056c8de449d30aee5f8c7302f 100644 (file)
--- a/src/osd/ErasureCodePlugin.h
+++ b/src/osd/ErasureCodePlugin.h
@@ -42,6 +42,7 @@ namespace ceph {
   public:
     Mutex lock;
     bool loading;
+    bool disable_dlclose;
     std::map<std::string,ErasureCodePlugin*> plugins;
 
     static ErasureCodePluginRegistry singleton;