From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 21 Feb 2017 14:24:14 +0000 (+0000)
Subject: mpm_worker: no mutex needed at ptrans' allocator level.
X-Git-Tag: 2.5.0-alpha~627
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=afea2aad65fc1d7a96bb9341c22dc8a07250734f;p=thirdparty%2Fapache%2Fhttpd.git

mpm_worker: no mutex needed at ptrans' allocator level.
(reverts r1783808)



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

diff --git a/docs/log-message-tags/next-number b/docs/log-message-tags/next-number
index 8a0934b514a..e7ea1abc3cc 100644
--- a/docs/log-message-tags/next-number
+++ b/docs/log-message-tags/next-number
@@ -1 +1 @@
-10020
+10019
diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 0de0726bbab..969a8196bd0 100644
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -678,8 +678,6 @@ static void * APR_THREAD_FUNC listener_thread(apr_thread_t *thd, void * dummy)
         } /* if/else */
 
         if (!listener_may_exit) {
-            apr_thread_mutex_t *mutex;
-
             if (ptrans == NULL) {
                 /* we can't use a recycled transaction pool this time.
                  * create a new transaction pool */
@@ -691,31 +689,6 @@ static void * APR_THREAD_FUNC listener_thread(apr_thread_t *thd, void * dummy)
                 apr_allocator_owner_set(allocator, ptrans);
             }
             apr_pool_tag(ptrans, "transaction");
-
-            /* We need a mutex in the allocator to synchronize ptrans'
-             * children creations/destructions, but this mutex ought to
-             * live in ptrans itself to avoid leaks, hence it's cleared
-             * in ap_push_pool(). We could recycle some pconf's mutexes
-             * like we do for ptrans subpools, but that'd need another
-             * synchronization mechanism, whereas creating a pthread
-             * mutex (unix here!) is really as simple/fast as a static
-             * PTHREAD_MUTEX_INIT assignment, so let's not bother and
-             * create the mutex for each ptrans (recycled or not).
-             */
-            rv = apr_thread_mutex_create(&mutex,
-                                         APR_THREAD_MUTEX_DEFAULT,
-                                         ptrans);
-            if (rv != APR_SUCCESS) {
-                ap_log_error(APLOG_MARK, APLOG_CRIT, rv,
-                             ap_server_conf, APLOGNO(10019)
-                             "Failed to create transaction pool mutex");
-                resource_shortage = 1;
-                signal_threads(ST_GRACEFUL);
-                return NULL;
-            }
-            apr_allocator_mutex_set(apr_pool_allocator_get(ptrans),
-                                    mutex);
-
             rv = lr->accept_func(&csd, lr, ptrans);
             /* later we trash rv and rely on csd to indicate success/failure */
             AP_DEBUG_ASSERT(rv == APR_SUCCESS || !csd);