comparison vamp-sdk/hostext/PluginLoader.cpp @ 98:896a97349ac5

* Add a static wrapper object to wrap the static instance pointer, so that
  it can be properly deleted on program exit instead of showing up in certain
  tools as leaked

 
     PluginCategoryHierarchy getPluginCategory(PluginKey key);
 
     string getLibraryPathForPlugin(PluginKey key);
 
+    static void setInstanceToClean(PluginLoader *instance);
+
 protected:
     class PluginDeletionNotifyAdapter : public PluginWrapper {
     public:
         PluginDeletionNotifyAdapter(Plugin *plugin, Impl *loader);
         virtual ~PluginDeletionNotifyAdapter();
     protected:
         Impl *m_loader;
     };
 
+    class InstanceCleaner {
+    public:
+        InstanceCleaner() : m_instance(0) { }
+        ~InstanceCleaner() { delete m_instance; }
+        void setInstance(PluginLoader *instance) { m_instance = instance; }
+    protected:
+        PluginLoader *m_instance;
+    };
+
     virtual void pluginDeleted(PluginDeletionNotifyAdapter *adapter);
 
     map<PluginKey, string> m_pluginLibraryNameMap;
     bool m_allPluginsEnumerated;
     void enumeratePlugins(PluginKey forPlugin = "");

     void unloadLibrary(void *handle);
     void *lookupInLibrary(void *handle, const char *symbol);
 
     string splicePath(string a, string b);
     vector<string> listFiles(string dir, string ext);
+    
+    static InstanceCleaner m_cleaner;
 };
 
 PluginLoader *
 PluginLoader::m_instance = 0;
 
+PluginLoader::Impl::InstanceCleaner
+PluginLoader::Impl::m_cleaner;
+
 PluginLoader::PluginLoader()
 {
     m_impl = new Impl();
 }
 

 }
 
 PluginLoader *
 PluginLoader::getInstance()
 {
-    if (!m_instance) m_instance = new PluginLoader();
+    if (!m_instance) {
+        // The cleaner doesn't own the instance, because we leave the
+        // instance pointer in the base class for binary backwards
+        // compatibility reasons and to avoid waste
+        m_instance = new PluginLoader();
+        Impl::setInstanceToClean(m_instance);
+    }
     return m_instance;
 }
 
 vector<PluginLoader::PluginKey>
 PluginLoader::listPlugins() 

 {
 }
 
 PluginLoader::Impl::~Impl()
 {
+}
+
+void
+PluginLoader::Impl::setInstanceToClean(PluginLoader *instance)
+{
+    m_cleaner.setInstance(instance);
 }
 
 vector<PluginLoader::PluginKey>
 PluginLoader::Impl::listPlugins() 
 {