Mercurial > hg > svcore
changeset 436:cff476cfce77 sv1-v1.3 sv1-v1.3rc1
* Updates for 1.3
| author | Chris Cannam |
|---|---|
| date | Thu, 10 Jul 2008 12:50:56 +0000 |
| parents | 824a87450f81 |
| children | 7226ebac8bd3 |
| files | base/StorageAdviser.cpp data/fft/FFTDataServer.cpp data/fileio/MatrixFile.cpp system/System.cpp transform/FeatureExtractionModelTransformer.cpp transform/ModelTransformerFactory.cpp |
| diffstat | 6 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/base/StorageAdviser.cpp Mon Jul 07 17:17:49 2008 +0000 +++ b/base/StorageAdviser.cpp Thu Jul 10 12:50:56 2008 +0000 @@ -22,7 +22,7 @@ #include <iostream> -#define DEBUG_STORAGE_ADVISER 1 +//#define DEBUG_STORAGE_ADVISER 1 long StorageAdviser::m_discPlanned = 0; long StorageAdviser::m_memoryPlanned = 0;
--- a/data/fft/FFTDataServer.cpp Mon Jul 07 17:17:49 2008 +0000 +++ b/data/fft/FFTDataServer.cpp Thu Jul 10 12:50:56 2008 +0000 @@ -714,7 +714,7 @@ StorageAdviser::recommend(m_criteria, minimumSize, maximumSize); } - std::cerr << "Recommendation was: " << recommendation << std::endl; +// std::cerr << "Recommendation was: " << recommendation << std::endl; memoryCache = false;
--- a/data/fileio/MatrixFile.cpp Mon Jul 07 17:17:49 2008 +0000 +++ b/data/fileio/MatrixFile.cpp Thu Jul 10 12:50:56 2008 +0000 @@ -516,7 +516,9 @@ throw FailedToOpenFile(m_fileName); } +#ifdef DEBUG_MATRIX_FILE std::cerr << "MatrixFile(" << this << ":" << m_fileName.toStdString() << ")::resume(): fd is " << m_fd << std::endl; +#endif } static int alloc = 0;
--- a/system/System.cpp Mon Jul 07 17:17:49 2008 +0000 +++ b/system/System.cpp Thu Jul 10 12:50:56 2008 +0000 @@ -258,7 +258,7 @@ if (!statvfs(path, &buf)) { // do the multiplies and divides in this order to reduce the // likelihood of arithmetic overflow - std::cerr << "statvfs(" << path << ") says available: " << buf.f_bavail << ", block size: " << buf.f_bsize << std::endl; +// std::cerr << "statvfs(" << path << ") says available: " << buf.f_bavail << ", block size: " << buf.f_bsize << std::endl; uint64_t available = ((buf.f_bavail / 1024) * buf.f_bsize) / 1024; if (available > INT_MAX) available = INT_MAX; return int(available);
--- a/transform/FeatureExtractionModelTransformer.cpp Mon Jul 07 17:17:49 2008 +0000 +++ b/transform/FeatureExtractionModelTransformer.cpp Thu Jul 10 12:50:56 2008 +0000 @@ -271,7 +271,7 @@ FeatureExtractionModelTransformer::~FeatureExtractionModelTransformer() { - std::cerr << "FeatureExtractionModelTransformer::~FeatureExtractionModelTransformer()" << std::endl; +// std::cerr << "FeatureExtractionModelTransformer::~FeatureExtractionModelTransformer()" << std::endl; delete m_plugin; delete m_descriptor; }
--- a/transform/ModelTransformerFactory.cpp Mon Jul 07 17:17:49 2008 +0000 +++ b/transform/ModelTransformerFactory.cpp Thu Jul 10 12:50:56 2008 +0000 @@ -402,7 +402,7 @@ QObject *s = sender(); ModelTransformer *transformer = dynamic_cast<ModelTransformer *>(s); - std::cerr << "ModelTransformerFactory::transformerFinished(" << transformer << ")" << std::endl; +// std::cerr << "ModelTransformerFactory::transformerFinished(" << transformer << ")" << std::endl; if (!transformer) { std::cerr << "WARNING: ModelTransformerFactory::transformerFinished: sender is not a transformer" << std::endl;