sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove duplicate locks - handled in pool.hpp already (mapnik held up fine this way in the wms benchmarks)

Browse source
This commit is contained in:
Dane Springmeyer 2010-09-14 17:08:18 +00:00
parent 73fe7fda4a
commit fbd0e4954c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/input/postgis/connection_manager.hpp
View file

@ -106,7 +106,7 @@ public:
bool registerPool(const ConnectionCreator<Connection>& creator,unsigned initialSize,unsigned maxSize) bool registerPool(const ConnectionCreator<Connection>& creator,unsigned initialSize,unsigned maxSize)
{ {
#ifdef MAPNIK_THREADSAFE #ifdef MAPNIK_THREADSAFE
mutex::scoped_lock lock(mutex_); //mutex::scoped_lock lock(mutex_);
#endif #endif
if (pools_.find(creator.id())==pools_.end()) if (pools_.find(creator.id())==pools_.end())
{ {
@ -121,7 +121,7 @@ public:
boost::shared_ptr<PoolType> getPool(std::string const& key) boost::shared_ptr<PoolType> getPool(std::string const& key)
{ {
#ifdef MAPNIK_THREADSAFE #ifdef MAPNIK_THREADSAFE
mutex::scoped_lock lock(mutex_); //mutex::scoped_lock lock(mutex_);
#endif #endif
ContType::const_iterator itr=pools_.find(key); ContType::const_iterator itr=pools_.find(key);
if (itr!=pools_.end()) if (itr!=pools_.end())
@ -135,7 +135,7 @@ public:
HolderType get(std::string const& key) HolderType get(std::string const& key)
{ {
#ifdef MAPNIK_THREADSAFE #ifdef MAPNIK_THREADSAFE
mutex::scoped_lock lock(mutex_); //mutex::scoped_lock lock(mutex_);
#endif #endif
ContType::const_iterator itr=pools_.find(key); ContType::const_iterator itr=pools_.find(key);
if (itr!=pools_.end()) if (itr!=pools_.end())