Maximum 40 entries in config and capabilities cache

mhugent · mhugent · commit 89fe2289f15e · 2011-05-11T17:10:22.000+02:00
diff --git a/src/mapserver/qgscapabilitiescache.cpp b/src/mapserver/qgscapabilitiescache.cpp
@@ -40,5 +40,11 @@ const QDomDocument* QgsCapabilitiesCache::searchCapabilitiesDocument( const QStr
 
 void QgsCapabilitiesCache::insertCapabilitiesDocument( const QString& configFilePath, const QDomDocument* doc )
 {
+  if( mCachedCapabilities.size() > 40 )
+  {
+    //remove another cache entry to avoid memory problems
+    QHash<QString, QDomDocument>::iterator capIt = mCachedCapabilities.begin();
+    mCachedCapabilities.erase( capIt );
+  }
   mCachedCapabilities.insert( configFilePath, doc->cloneNode().toDocument() );
 }
diff --git a/src/mapserver/qgsconfigcache.cpp b/src/mapserver/qgsconfigcache.cpp
@@ -61,12 +61,9 @@ QgsConfigParser* QgsConfigCache::insertConfiguration( const QString& filePath )
 {
   if ( mCachedConfigurations.size() > 40 )
   {
-    //remove 10 elements to avoid memory problems
+    //remove a cache entry to avoid memory problems
     QHash<QString, QgsConfigParser*>::iterator configIt = mCachedConfigurations.begin();
-    for ( int i = 0; i < 10; ++i )
-    {
-      configIt = mCachedConfigurations.erase( configIt );
-    }
+    mCachedConfigurations.erase( configIt );
   }
 
   //first open file

Original file line number	Diff line number	Diff line change
`@@ -40,5 +40,11 @@ const QDomDocument* QgsCapabilitiesCache::searchCapabilitiesDocument( const QStr`
`40`	`40`
`41`	`41`	`void QgsCapabilitiesCache::insertCapabilitiesDocument( const QString& configFilePath, const QDomDocument* doc )`
`42`	`42`	`{`
	`43`	`+ if( mCachedCapabilities.size() > 40 )`
	`44`	`+ {`
	`45`	`+ //remove another cache entry to avoid memory problems`
	`46`	`+ QHash<QString, QDomDocument>::iterator capIt = mCachedCapabilities.begin();`
	`47`	`+ mCachedCapabilities.erase( capIt );`
	`48`	`+ }`
`43`	`49`	`mCachedCapabilities.insert( configFilePath, doc->cloneNode().toDocument() );`
`44`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,12 +61,9 @@ QgsConfigParser* QgsConfigCache::insertConfiguration( const QString& filePath )`
`61`	`61`	`{`
`62`	`62`	`if ( mCachedConfigurations.size() > 40 )`
`63`	`63`	`{`
`64`		`- //remove 10 elements to avoid memory problems`
	`64`	`+ //remove a cache entry to avoid memory problems`
`65`	`65`	`QHash<QString, QgsConfigParser*>::iterator configIt = mCachedConfigurations.begin();`
`66`		`- for ( int i = 0; i < 10; ++i )`
`67`		`- {`
`68`		`- configIt = mCachedConfigurations.erase( configIt );`
`69`		`- }`
	`66`	`+ mCachedConfigurations.erase( configIt );`
`70`	`67`	`}`
`71`	`68`
`72`	`69`	`//first open file`