diff options
| author | Gordon Sim <gsim@apache.org> | 2007-05-22 09:50:45 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2007-05-22 09:50:45 +0000 |
| commit | 13a373d975a60d45b2dd6de4c3cc821296330e16 (patch) | |
| tree | 2ae3d0c69b5032e595281b283aeb2b254eea2d8b /cpp/lib/common/sys/Module.h | |
| parent | 89d3aef1e2888d415f11b1c47450a5cf5ad32b3e (diff) | |
| download | qpid-python-13a373d975a60d45b2dd6de4c3cc821296330e16.tar.gz | |
Patch submitted to qpid-dev by ksmith@redhat.com. Fixes concurrency issues arising from previous move to use singleton apr pool.
"My patch does three things:
1) Modifies the APRPool class to use alloc/free semantics for APR memory pools. Each time a caller calls APRPool::get() they'll their own pool reference. I've fixed up all the call sites I can find to also call APRPool::free() at the appropriate time.
2) Caches freed APR memory pools in a STL stack. This cuts down on the number of memory pools created overall.
3) As a result of doing #1 and #2 I've introduced a guard mutex around APRPool::get() and APRPool::free(). This is to prevent concurrent access to the memory pool cache. If it's too heavyweight, the mutex along with the caching mechanism could be removed entirely."
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@540511 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/lib/common/sys/Module.h')
| -rw-r--r-- | cpp/lib/common/sys/Module.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/lib/common/sys/Module.h b/cpp/lib/common/sys/Module.h index 9bf5d6e1fc..64ed309afb 100644 --- a/cpp/lib/common/sys/Module.h +++ b/cpp/lib/common/sys/Module.h @@ -104,7 +104,9 @@ template <class T> Module<T>::~Module() throw() template <class T> void Module<T>::load(const std::string& name) { - CHECK_APR_SUCCESS(apr_dso_load(&handle, name.c_str(), APRPool::get())); + apr_pool_t* pool = APRPool::get(); + CHECK_APR_SUCCESS(apr_dso_load(&handle, name.c_str(), pool)); + APRPool::free(pool); } template <class T> void Module<T>::unload() |