comparison PyExtensionManager.cpp @ 67:146d14ab15e7

Debug output: off by default, on with VAMPY_VERBOSE environment variable

+/* -*- c-basic-offset: 8 indent-tabs-mode: t -*- */
 /*
 
  * Vampy : This plugin is a wrapper around the Vamp plugin API.
  * It allows for writing Vamp plugins in Python.
 

 #include <Python.h>
 #include "vamp/vamp.h"
 #include "PyExtensionModule.h"
 #include "PyExtensionManager.h"
 #include <algorithm>
+#include "Debug.h"
 
 using std::cerr;
 using std::endl;
 using std::string;
 using std::vector;

 		NULL
 };
 
 PyExtensionManager::PyExtensionManager()
 {
-#ifdef _DEBUG	
-	cerr << "Creating extension manager." << endl;
-#endif
+	DSTREAM << "Creating extension manager." << endl;
 }
 
 bool 
 PyExtensionManager::initExtension() 
 {
-	cerr << "Initialising extension module." << endl; 
+	DSTREAM << "Initialising extension module." << endl; 
 
 	/// call the module initialiser first
 	initvampy();
 
 	/// these references are all borrowed

 	if (!m_pyVampyNamespace) 
 		{cerr << "Vampy::PyExtensionManager::initExtension: VampyNamespace failed." << endl; return false;}
     
 	/// initialise local namespaces
 	updateAllLocals();
-#ifdef _DEBUG
-	cerr << "Vampy: Extension namespaces updated." << endl; 
-#endif	
+
+	DSTREAM << "Vampy: Extension namespaces updated." << endl; 
+
 	return true;
 }
 
 
 PyExtensionManager::~PyExtensionManager()
 {
-#ifdef _DEBUG	
-	cerr << "Cleaning locals..." << endl;
-#endif	
+	DSTREAM << "Cleaning locals..." << endl;
 
 	cleanAllLocals(); 
 
-#ifdef _DEBUG	
-	cerr << "Cleaning module..." << endl;
-#endif	
+	DSTREAM << "Cleaning module..." << endl;
 
 	if (!cleanModule()) 
 		cerr << "Vampy::~PyExtensionManager: failed to clean extension module." << endl;
-	cerr << "Vampy::~PyExtensionManager: Extension module cleaned." << endl;
+	DSTREAM << "Vampy::~PyExtensionManager: Extension module cleaned." << endl;
 }
 
 
 
 void

 	for (size_t i = 0; i < pyPlugs.size(); ++i) {
 		string modName = pyPlugs[i];
 		string tmp = modName.substr(modName.rfind(':')+1,modName.size()-1);
 		m_plugModuleNames.push_back(tmp);
 
-#ifdef _DEBUG_VALUES		
-		cerr << "Inserted module name: " << tmp << endl;
-#endif		
-
+		DSTREAM << "Inserted module name: " << tmp << endl;
 	}
 }
 
 void
 PyExtensionManager::deleteModuleName(string plugKey)
 {
 	string name = plugKey.substr(plugKey.rfind(':')+1,plugKey.size()-1);
 	vector<string>::iterator it = 
 		find (m_plugModuleNames.begin(), m_plugModuleNames.end(), name);
 	if (it != m_plugModuleNames.end()) m_plugModuleNames.erase(it);
-#ifdef _DEBUG_VALUES		
-	cerr << "PyExtensionManager::deleteModuleName: Deleted module name: " << name << endl;
-#endif	
+
+	DSTREAM << "PyExtensionManager::deleteModuleName: Deleted module name: " << name << endl;
 }
 
 
 void 
 PyExtensionManager::cleanAllLocals() const

 		if (!key) break;
 		if (PyDict_Contains(pyPlugDict,key)) {
 			if (PyDict_SetItem(pyPlugDict,key,Py_None) != 0)
 				cerr << "Vampy::PyExtensionManager::cleanLocalNamespace: Failed: " 
 				<< name << " of "<< plugModuleName << endl;
-#ifdef _DEBUG_VALUES
-			else cerr << "Cleaned local name: " << name << endl;
-#endif			
+			else DSTREAM << "Cleaned local name: " << name << endl;
 		}
 		Py_DECREF(key);
 	}
 }
 

 		if (PyDict_Contains(pyPlugDict,key)) {
 			PyObject* item = PyDict_GetItem(m_pyVampyNamespace,key);
 			if (PyDict_SetItem(pyPlugDict,key,item) != 0)
 				cerr << "Vampy::PyExtensionManager::updateLocalNamespace: Failed: " 
 				<< name << " of "<< plugModuleName << endl;
-#ifdef _DEBUG_VALUES
-			else cerr << "Updated local name: " << name << endl;
-#endif			
+			else DSTREAM << "Updated local name: " << name << endl;
 		}
 		Py_DECREF(key);
 	}
 }
 

 		return false;
 	} else {
 		PyObject *dict = PyModule_GetDict(m);
 #ifdef _DEBUG		
 		Py_ssize_t ln = PyDict_Size(dict);
-		cerr << "Vampy::PyExtensionManager::cleanModule: Size of module dict = " << (int) ln << endl;
+		DSTREAM << "Vampy::PyExtensionManager::cleanModule: Size of module dict = " << (int) ln << endl;
 #endif		
 		/// Clean the module dictionary.
 		// printDict(dict);
 		PyDict_Clear(dict);
 		if (PyErr_Occurred()) 

 		PyObject *name = PyString_FromString("vampy");
 		if (name) PyDict_SetItemString(dict,"__name__",name);
 		Py_XDECREF(name);
 #ifdef _DEBUG		
 	    ln = PyDict_Size(dict);
-		cerr << "Vampy::PyExtensionManager::cleanModule: Size of module dict (cleaned) = " << (int) ln << endl;
+		DSTREAM << "Vampy::PyExtensionManager::cleanModule: Size of module dict (cleaned) = " << (int) ln << endl;
 #endif
 		return true;
 	}
 }