comparison transform/TransformFactory.cpp @ 600:3f6d9930bc28

* Fix crash on exit on win32.  This was caused by incorrectly using fftw_free()
  to free the string returned from fftw_export_wisdom_to_string(), instead of
  plain free().
* Various debug artifacts related to tracking down the above

 
 TransformFactory::~TransformFactory()
 {
     m_exiting = true;
     if (m_thread) {
+#ifdef DEBUG_TRANSFORM_FACTORY
         std::cerr << "TransformFactory::~TransformFactory: waiting on thread" << std::endl;
+#endif
         m_thread->wait();
         delete m_thread;
+#ifdef DEBUG_TRANSFORM_FACTORY
+        std::cerr << "TransformFactory::~TransformFactory: waited and done" << std::endl;
+#endif
     }
 }
 
 void
 TransformFactory::startPopulationThread()

     populateTransforms();
 
     std::set<TransformDescription> dset;
     for (TransformDescriptionMap::const_iterator i = m_transforms.begin();
 	 i != m_transforms.end(); ++i) {
-//        cerr << "inserting transform into set: id = " << i->second.identifier.toStdString() << endl;
+#ifdef DEBUG_TRANSFORM_FACTORY
+        cerr << "inserting transform into set: id = " << i->second.identifier.toStdString() << endl;
+#endif
 	dset.insert(i->second);
     }
 
     TransformList list;
     for (std::set<TransformDescription>::const_iterator i = dset.begin();
 	 i != dset.end(); ++i) {
-//        cerr << "inserting transform into list: id = " << i->identifier.toStdString() << endl;
+#ifdef DEBUG_TRANSFORM_FACTORY
+        cerr << "inserting transform into list: id = " << i->identifier.toStdString() << endl;
+#endif
 	list.push_back(*i);
     }
 
     return list;
 }

     populateUninstalledTransforms();
     
     std::set<TransformDescription> dset;
     for (TransformDescriptionMap::const_iterator i = m_uninstalledTransforms.begin();
 	 i != m_uninstalledTransforms.end(); ++i) {
-//        cerr << "inserting transform into set: id = " << i->second.identifier.toStdString() << endl;
+#ifdef DEBUG_TRANSFORM_FACTORY
+        cerr << "inserting transform into set: id = " << i->second.identifier.toStdString() << endl;
+#endif
 	dset.insert(i->second);
     }
 
     TransformList list;
     for (std::set<TransformDescription>::const_iterator i = dset.begin();
 	 i != dset.end(); ++i) {
-//        cerr << "inserting transform into uninstalled list: id = " << i->identifier.toStdString() << endl;
+#ifdef DEBUG_TRANSFORM_FACTORY
+        cerr << "inserting transform into uninstalled list: id = " << i->identifier.toStdString() << endl;
+#endif
 	list.push_back(*i);
     }
 
     return list;
 }

 	    }
 
             bool configurable = (!plugin->getPrograms().empty() ||
                                  !plugin->getParameterDescriptors().empty());
 
-//            cerr << "Feature extraction plugin transform: " << transformId.toStdString() << " friendly name: " << friendlyName.toStdString() << endl;
+#ifdef DEBUG_TRANSFORM_FACTORY
+            cerr << "Feature extraction plugin transform: " << transformId.toStdString() << " friendly name: " << friendlyName.toStdString() << endl;
+#endif
 
 	    transforms[transformId] = 
                 TransformDescription(TransformDescription::Analysis,
                                      category,
                                      transformId,

     for (QStringList::const_iterator i = ids.begin(); i != ids.end(); ++i) {
         
         PluginRDFDescription desc(*i);
 
         QString name = desc.getPluginName();
-//        if (name == "") {
-//            std::cerr << "TransformFactory::populateUninstalledTransforms: "
-//                      << "No name available for plugin " << i->toStdString()
-//                      << ", skipping" << std::endl;
-//            continue;
-//        }
+#ifdef DEBUG_TRANSFORM_FACTORY
+        if (name == "") {
+            std::cerr << "TransformFactory::populateUninstalledTransforms: "
+                      << "No name available for plugin " << i->toStdString()
+                      << ", skipping" << std::endl;
+            continue;
+        }
+#endif
 
         QString description = desc.getPluginDescription();
         QString maker = desc.getPluginMaker();
         QString infoUrl = desc.getPluginInfoURL();
 

         for (QStringList::const_iterator j = oids.begin(); j != oids.end(); ++j) {
 
             TransformId tid = Transform::getIdentifierForPluginOutput(*i, *j);
             
             if (m_transforms.find(tid) != m_transforms.end()) {
-//                std::cerr << "TransformFactory::populateUninstalledTransforms: "
-//                          << tid.toStdString() << " is installed; adding info url if appropriate, skipping rest" << std::endl;
+#ifdef DEBUG_TRANSFORM_FACTORY
+                std::cerr << "TransformFactory::populateUninstalledTransforms: "
+                          << tid.toStdString() << " is installed; adding info url if appropriate, skipping rest" << std::endl;
+#endif
                 if (infoUrl != "") {
                     if (m_transforms[tid].infoUrl == "") {
                         m_transforms[tid].infoUrl = infoUrl;
                     }
                 }
                 continue;
             }
 
-//            std::cerr << "TransformFactory::populateUninstalledTransforms: "
-//                      << "adding " << tid.toStdString() << std::endl;
+#ifdef DEBUG_TRANSFORM_FACTORY
+            std::cerr << "TransformFactory::populateUninstalledTransforms: "
+                      << "adding " << tid.toStdString() << std::endl;
+#endif
 
             QString oname = desc.getOutputName(*j);
             if (oname == "") oname = *j;
             
             TransformDescription td;

         if (m_exiting) return;
     }
 
     m_uninstalledTransformsPopulated = true;
 
+#ifdef DEBUG_TRANSFORM_FACTORY
     std::cerr << "populateUninstalledTransforms exiting" << std::endl;
+#endif
 }
 
 Transform
 TransformFactory::getDefaultTransformFor(TransformId id, size_t rate)
 {