Merge pull request #2197 from manisandro/dropconnections

jef-n · jef-n · commit 2a7ccca6fe22 · 2015-07-13T17:26:21.000+02:00
Add QgsConnectionPool::dropConnections, delete connection groups when pool is destroyed
diff --git a/src/core/qgsconnectionpool.h b/src/core/qgsconnectionpool.h
@@ -228,6 +228,17 @@ class QgsConnectionPool
 
     typedef QMap<QString, T_Group*> T_Groups;
 
+    virtual ~QgsConnectionPool()
+    {
+      mMutex.lock();
+      foreach ( T_Group* group, mGroups )
+      {
+        delete group;
+      }
+      mGroups.clear();
+      mMutex.unlock();
+    }
+
     //! Try to acquire a connection: if no connections are available, the thread will get blocked.
     //! @return initialized connection or null on error
     T acquireConnection( const QString& connInfo )
diff --git a/src/providers/ogr/qgsogrconnpool.h b/src/providers/ogr/qgsogrconnpool.h
@@ -61,7 +61,13 @@ class QgsOgrConnPoolGroup : public QObject, public QgsConnectionPoolGroup<QgsOgr
     Q_OBJECT
 
   public:
-    QgsOgrConnPoolGroup( QString name ) : QgsConnectionPoolGroup<QgsOgrConn*>( name ) { initTimer( this ); }
+    QgsOgrConnPoolGroup( QString name ) : QgsConnectionPoolGroup<QgsOgrConn*>( name ), mRefCount( 0 ) { initTimer( this ); }
+    void ref() { ++mRefCount; }
+    bool unref()
+    {
+      Q_ASSERT( mRefCount > 0 );
+      return --mRefCount == 0;
+    }
 
   protected slots:
     void handleConnectionExpired() { onConnectionExpired(); }
@@ -71,6 +77,9 @@ class QgsOgrConnPoolGroup : public QObject, public QgsConnectionPoolGroup<QgsOgr
   protected:
     Q_DISABLE_COPY( QgsOgrConnPoolGroup )
 
+  private:
+    int mRefCount;
+
 };
 
 /** Ogr connection pool - singleton */
@@ -79,6 +88,29 @@ class QgsOgrConnPool : public QgsConnectionPool<QgsOgrConn*, QgsOgrConnPoolGroup
   public:
     static QgsOgrConnPool* instance();
 
+    void ref( const QString& connInfo )
+    {
+      mMutex.lock();
+      T_Groups::iterator it = mGroups.find( connInfo );
+      if ( it == mGroups.end() )
+        it = mGroups.insert( connInfo, new QgsOgrConnPoolGroup( connInfo ) );
+      it.value()->ref();
+      mMutex.unlock();
+    }
+
+    void unref( const QString& connInfo )
+    {
+      mMutex.lock();
+      T_Groups::iterator it = mGroups.find( connInfo );
+      Q_ASSERT( it != mGroups.end() );
+      if ( it.value()->unref() )
+      {
+        delete it.value();
+        mGroups.erase( it );
+      }
+      mMutex.unlock();
+    }
+
   protected:
     Q_DISABLE_COPY( QgsOgrConnPool )
 
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -342,6 +342,12 @@ QgsOgrFeatureSource::QgsOgrFeatureSource( const QgsOgrProvider* p )
   mFields = p->mAttributeFields;
   mDriverName = p->ogrDriverName;
   mOgrGeometryTypeFilter = wkbFlatten( p->mOgrGeometryTypeFilter );
+  QgsOgrConnPool::instance()->ref( mFilePath );
+}
+
+QgsOgrFeatureSource::~QgsOgrFeatureSource()
+{
+  QgsOgrConnPool::instance()->unref( mFilePath );
 }
 
 QgsFeatureIterator QgsOgrFeatureSource::getFeatures( const QgsFeatureRequest& request )
diff --git a/src/providers/ogr/qgsogrfeatureiterator.h b/src/providers/ogr/qgsogrfeatureiterator.h
@@ -28,6 +28,7 @@ class QgsOgrFeatureSource : public QgsAbstractFeatureSource
 {
   public:
     QgsOgrFeatureSource( const QgsOgrProvider* p );
+    ~QgsOgrFeatureSource();
 
     virtual QgsFeatureIterator getFeatures( const QgsFeatureRequest& request ) override;
 
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -450,6 +450,8 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )
     mNativeTypes
     << QgsVectorDataProvider::NativeType( tr( "Date & Time" ), "datetime", QVariant::DateTime );
   }
+
+  QgsOgrConnPool::instance()->ref( mFilePath );
 }
 
 QgsOgrProvider::~QgsOgrProvider()
@@ -470,6 +472,8 @@ QgsOgrProvider::~QgsOgrProvider()
     free( extent_ );
     extent_ = 0;
   }
+
+  QgsOgrConnPool::instance()->unref( mFilePath );
 }
 
 QgsAbstractFeatureSource* QgsOgrProvider::featureSource() const

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ class QgsOgrFeatureSource : public QgsAbstractFeatureSource`
`28`	`28`	`{`
`29`	`29`	`public:`
`30`	`30`	`QgsOgrFeatureSource( const QgsOgrProvider* p );`
	`31`	`+ ~QgsOgrFeatureSource();`
`31`	`32`
`32`	`33`	`virtual QgsFeatureIterator getFeatures( const QgsFeatureRequest& request ) override;`
`33`	`34`
Original file line number	Diff line number	Diff line change
`@@ -450,6 +450,8 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )`
`450`	`450`	`mNativeTypes`
`451`	`451`	`<< QgsVectorDataProvider::NativeType( tr( "Date & Time" ), "datetime", QVariant::DateTime );`
`452`	`452`	`}`
	`453`	`+`
	`454`	`+ QgsOgrConnPool::instance()->ref( mFilePath );`
`453`	`455`	`}`
`454`	`456`
`455`	`457`	`QgsOgrProvider::~QgsOgrProvider()`
`@@ -470,6 +472,8 @@ QgsOgrProvider::~QgsOgrProvider()`
`470`	`472`	`free( extent_ );`
`471`	`473`	`extent_ = 0;`
`472`	`474`	`}`
	`475`	`+`
	`476`	`+ QgsOgrConnPool::instance()->unref( mFilePath );`
`473`	`477`	`}`
`474`	`478`
`475`	`479`	`QgsAbstractFeatureSource* QgsOgrProvider::featureSource() const`