Use the new APR pool code to reduce pool-related lock

contention in the worker MPM.
Submitted by:	Sander Striker
Reviewed by:	Brian Pane

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92482 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index e36f07bf35c3d00be6c41b91eda91c99641b7a3f..202f2f0c2e8d574dab61f3e8c2ce9037b5c66f3c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.30-dev
 
+  *) Use the new APR pool code to reduce pool-related lock
+     contention in the worker MPM.  [Sander Striker]
+
   *) The POD no longer assumes the child is listening on 127.0.0.1
      and now pulls the first hostname in the list of listeners to
      perform the dummy connect on. This fixes a bug when the user

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 48314cf89d6122e2b174ea32df544fd37564a227..3d28390d37c71bd4201d37865d8687f89c3c4441 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -654,7 +654,8 @@ static void *listener_thread(apr_thread_t *thd, void * dummy)
     got_fd:
         if (!workers_may_exit) {
             /* create a new transaction pool for each accepted socket */
-            apr_pool_create(&ptrans, tpool);
+            apr_pool_create_ex(&ptrans, tpool, NULL, APR_POOL_FNEW_ALLOCATOR);
+            apr_pool_tag(ptrans, "transaction");
 
             rv = lr->accept_func(&csd, lr, ptrans);