comparison plugin/FeatureExtractionPluginFactory.cpp @ 298:57d7889f626c

* Unload feature extraction plugin .so when destroyed

 #include "FeatureExtractionPluginFactory.h"
 #include "PluginIdentifier.h"
 
 #include "vamp/vamp.h"
 #include "vamp-sdk/PluginHostAdapter.h"
+#include "vamp-sdk/hostext/PluginWrapper.h"
 
 #include "system/System.h"
 
 #include <QDir>
 #include <QFile>

 #include <QTextStream>
 
 #include <iostream>
 
 //#define DEBUG_PLUGIN_SCAN_AND_INSTANTIATE 1
+
+class PluginDeletionNotifyAdapter : public Vamp::HostExt::PluginWrapper {
+public:
+    PluginDeletionNotifyAdapter(Vamp::Plugin *plugin,
+                                FeatureExtractionPluginFactory *factory) :
+        PluginWrapper(plugin), m_factory(factory) { }
+    virtual ~PluginDeletionNotifyAdapter();
+protected:
+    FeatureExtractionPluginFactory *m_factory;
+};
+
+PluginDeletionNotifyAdapter::~PluginDeletionNotifyAdapter()
+{
+    // see notes in vamp-sdk/hostext/PluginLoader.cpp from which this is drawn
+    Vamp::Plugin *p = m_plugin;
+    delete m_plugin;
+    m_plugin = 0;
+    if (m_factory) m_factory->pluginDeleted(p);
+}
 
 static FeatureExtractionPluginFactory *_nativeInstance = 0;
 
 FeatureExtractionPluginFactory *
 FeatureExtractionPluginFactory::instance(QString pluginType)

 Vamp::Plugin *
 FeatureExtractionPluginFactory::instantiatePlugin(QString identifier,
 						  float inputSampleRate)
 {
     Vamp::Plugin *rv = 0;
+    Vamp::PluginHostAdapter *plugin = 0;
 
     const VampPluginDescriptor *descriptor = 0;
     int index = 0;
 
     QString type, soname, label;

     if (!descriptor) {
         std::cerr << "FeatureExtractionPluginFactory::instantiatePlugin: Failed to find plugin \"" << label.toStdString() << "\" in library " << soname.toStdString() << std::endl;
         goto done;
     }
 
-    rv = new Vamp::PluginHostAdapter(descriptor, inputSampleRate);
+    plugin = new Vamp::PluginHostAdapter(descriptor, inputSampleRate);
+
+    if (plugin) {
+        m_handleMap[plugin] = libraryHandle;
+        rv = new PluginDeletionNotifyAdapter(plugin, this);
+    }
 
 //    std::cerr << "FeatureExtractionPluginFactory::instantiatePlugin: Constructed Vamp plugin, rv is " << rv << std::endl;
 
     //!!! need to dlclose() when plugins from a given library are unloaded
 

     }
 
 //    std::cerr << "FeatureExtractionPluginFactory::instantiatePlugin: Instantiated plugin " << label.toStdString() << " from library " << soname.toStdString() << ": descriptor " << descriptor << ", rv "<< rv << ", label " << rv->getName() << ", outputs " << rv->getOutputDescriptors().size() << std::endl;
     
     return rv;
+}
+
+void
+FeatureExtractionPluginFactory::pluginDeleted(Vamp::Plugin *plugin)
+{
+    void *handle = m_handleMap[plugin];
+    if (handle) {
+        std::cerr << "unloading library " << handle << " for plugin " << plugin << std::endl;
+        DLCLOSE(handle);
+    }
+    m_handleMap.erase(plugin);
 }
 
 QString
 FeatureExtractionPluginFactory::getPluginCategory(QString identifier)
 {