comparison data/fileio/FileSource.cpp @ 529:993e0a4f1343

* Try to avoid leaving output files open after completion

 FileSource::RemoteLocalMap
 FileSource::m_remoteLocalMap;
 
 QMutex
 FileSource::m_mapMutex;
+
+#ifdef DEBUG_FILE_SOURCE
+static int extantCount = 0;
+static std::map<QString, int> urlExtantCountMap;
+static void incCount(QString url) {
+    ++extantCount;
+    if (urlExtantCountMap.find(url) == urlExtantCountMap.end()) {
+        urlExtantCountMap[url] = 1;
+    } else {
+        ++urlExtantCountMap[url];
+    }
+    std::cerr << "FileSource: Now " << urlExtantCountMap[url] << " for this url, " << extantCount << " total" << std::endl;
+}
+static void decCount(QString url) {
+    --extantCount;
+    --urlExtantCountMap[url];
+    std::cerr << "FileSource: Now " << urlExtantCountMap[url] << " for this url, " << extantCount << " total" << std::endl;
+}
+#endif
 
 FileSource::FileSource(QString fileOrUrl, ProgressReporter *reporter,
                        QString preferredContentType) :
     m_url(fileOrUrl),
     m_ftp(0),

     m_reporter(reporter),
     m_refCounted(false)
 {
 #ifdef DEBUG_FILE_SOURCE
     std::cerr << "FileSource::FileSource(" << fileOrUrl.toStdString() << ")" << std::endl;
+    incCount(m_url.toString());
 #endif
 
     if (!canHandleScheme(m_url)) {
         std::cerr << "FileSource::FileSource: ERROR: Unsupported scheme in URL \"" << m_url.toString().toStdString() << "\"" << std::endl;
         m_errorString = tr("Unsupported scheme in URL");

     m_reporter(reporter),
     m_refCounted(false)
 {
 #ifdef DEBUG_FILE_SOURCE
     std::cerr << "FileSource::FileSource(" << url.toString().toStdString() << ") [as url]" << std::endl;
+    incCount(m_url.toString());
 #endif
 
     if (!canHandleScheme(m_url)) {
         std::cerr << "FileSource::FileSource: ERROR: Unsupported scheme in URL \"" << m_url.toString().toStdString() << "\"" << std::endl;
         m_errorString = tr("Unsupported scheme in URL");

     m_reporter(rf.m_reporter),
     m_refCounted(false)
 {
 #ifdef DEBUG_FILE_SOURCE
     std::cerr << "FileSource::FileSource(" << m_url.toString().toStdString() << ") [copy ctor]" << std::endl;
+    incCount(m_url.toString());
 #endif
 
     if (!canHandleScheme(m_url)) {
         std::cerr << "FileSource::FileSource: ERROR: Unsupported scheme in URL \"" << m_url.toString().toStdString() << "\"" << std::endl;
         m_errorString = tr("Unsupported scheme in URL");

 
 FileSource::~FileSource()
 {
 #ifdef DEBUG_FILE_SOURCE
     std::cerr << "FileSource(" << m_url.toString().toStdString() << ")::~FileSource" << std::endl;
+    decCount(m_url.toString());
 #endif
 
     cleanup();
 
     if (isRemote() && !m_leaveLocalFile) deleteCacheFile();

         if (location != "") {
             QUrl newUrl(location);
             if (newUrl != m_url) {
                 cleanup();
                 deleteCacheFile();
+#ifdef DEBUG_FILE_SOURCE
+                decCount(m_url.toString());
+                incCount(newUrl.toString());
+#endif
                 m_url = newUrl;
                 m_localFile = 0;
                 m_lastStatus = 0;
                 m_done = false;
                 m_refCounted = false;