httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1706083 - /httpd/httpd/trunk/server/mpm/motorz/motorz.c
Date Wed, 30 Sep 2015 16:59:24 GMT
Author: jim
Date: Wed Sep 30 16:59:23 2015
New Revision: 1706083

URL: http://svn.apache.org/viewvc?rev=1706083&view=rev
Log:
Do only on 2nd pass

Modified:
    httpd/httpd/trunk/server/mpm/motorz/motorz.c

Modified: httpd/httpd/trunk/server/mpm/motorz/motorz.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/motorz/motorz.c?rev=1706083&r1=1706082&r2=1706083&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/motorz/motorz.c (original)
+++ httpd/httpd/trunk/server/mpm/motorz/motorz.c Wed Sep 30 16:59:23 2015
@@ -893,9 +893,10 @@ static void child_main(motorz_core_t *mz
 
     (void) ap_update_child_status(sbh, SERVER_READY, (request_rec *) NULL);
 
+#if 0
     apr_skiplist_init(&mz->timer_ring, mz->pool);
     apr_skiplist_set_compare(mz->timer_ring, timer_comp, timer_comp);
-
+#endif
     status = motorz_setup_workers(mz);
     if (status != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_CRIT, status, ap_server_conf, APLOGNO(02868)
@@ -1598,19 +1599,19 @@ static int motorz_pre_config(apr_pool_t
                 return HTTP_INTERNAL_SERVER_ERROR;
             }
         }
+        apr_pool_create(&mz->pool, ap_pglobal);
+        apr_pool_tag(mz->pool, "motorz-mpm-core");
+        apr_skiplist_init(&mz->timer_ring, mz->pool);
+        apr_skiplist_set_compare(mz->timer_ring, timer_comp, timer_comp);
+        rv = apr_thread_mutex_create(&mz->mtx, 0, mz->pool);
+        if (rv != APR_SUCCESS) {
+            ap_log_error(APLOG_MARK, APLOG_CRIT, rv, NULL, APLOGNO()
+                         "motorz_pre_config: apr_thread_mutex_create failed");
+            return rv;
+        }
     }
 
     parent_pid = ap_my_pid = getpid();
-    apr_pool_create(&mz->pool, ap_pglobal);
-    apr_pool_tag(mz->pool, "motorz-mpm-core");
-    apr_skiplist_init(&mz->timer_ring, mz->pool);
-    apr_skiplist_set_compare(mz->timer_ring, timer_comp, timer_comp);
-    rv = apr_thread_mutex_create(&mz->mtx, 0, mz->pool);
-    if (rv != APR_SUCCESS) {
-        ap_log_error(APLOG_MARK, APLOG_CRIT, rv, NULL, APLOGNO()
-                     "motorz_pre_config: apr_thread_mutex_create failed");
-        return rv;
-    }
 
     ap_listen_pre_config();
     ap_num_kids = DEFAULT_START_DAEMON;



Mime
View raw message