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/apr/LFProcessor.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/apr/LFProcessor.h')
| -rw-r--r-- | cpp/lib/common/sys/apr/LFProcessor.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/lib/common/sys/apr/LFProcessor.h b/cpp/lib/common/sys/apr/LFProcessor.h index de90199472..0f4850ee08 100644 --- a/cpp/lib/common/sys/apr/LFProcessor.h +++ b/cpp/lib/common/sys/apr/LFProcessor.h @@ -57,6 +57,7 @@ namespace sys { qpid::sys::Mutex countLock; std::vector<LFSessionContext*> sessions; volatile bool stopped; + apr_pool_t* pool; const apr_pollfd_t* getNextEvent(); void waitToLead(); @@ -65,7 +66,7 @@ namespace sys { virtual void run(); public: - LFProcessor(apr_pool_t* pool, int workers, int size, int timeout); + LFProcessor(int workers, int size, int timeout); /** * Add the fd to the poll set. Relies on the client_data being * an instance of LFSessionContext. |