Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1732229 - /httpd/httpd/trunk/server/mpm/motorz/motorz.c
Date: Wed, 24 Feb 2016 20:49:31 -0000
To: cvs@httpd.apache.org
From: jim@apache.org
Message-Id: <20160224204931.A8F8D3A0052@svn01-us-west.apache.org>

Author: jim
Date: Wed Feb 24 20:49:31 2016
New Revision: 1732229

URL: http://svn.apache.org/viewvc?rev=1732229&view=rev
Log:
use APR

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=1732229&r1=1732228&r2=1732229&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/motorz/motorz.c (original)
+++ httpd/httpd/trunk/server/mpm/motorz/motorz.c Wed Feb 24 20:49:31 2016
@@ -524,9 +524,8 @@ static int motorz_setup_pollset(motorz_c
     int i;
     apr_status_t rv;
     int good_methods[] = {APR_POLLSET_KQUEUE, APR_POLLSET_PORT, APR_POLLSET_EPOLL};
-    char *methods[] = {"kqueue", "port", "epoll"};
 
-    for (i = 0; i < sizeof(good_methods) / sizeof(void*); i++) {
+    for (i = 0; i < sizeof(good_methods) / sizeof(good_methods[0]); i++) {
         rv = apr_pollset_create_ex(&mz->pollset,
                                   512,
                                   mz->pool,
@@ -534,7 +533,7 @@ static int motorz_setup_pollset(motorz_c
                                   good_methods[i]);
         if (rv == APR_SUCCESS) {
             ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, ap_server_conf, APLOGNO(02852)
-                         "motorz_setup_pollset: apr_pollset_create_ex using %s", methods[i]);
+                         "motorz_setup_pollset: apr_pollset_create_ex using %s", apr_pollset_method_name(mz->pollset));
 
             break;
         }
@@ -551,6 +550,8 @@ static int motorz_setup_pollset(motorz_c
         ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ap_server_conf, APLOGNO(02854)
                      "motorz_setup_pollset: apr_pollset_create failed for all possible backends!");
     }
+    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO()
+                 "motorz_setup_pollset: Using %s", apr_pollset_method_name(mz->pollset));
     return rv;
 }