httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1203404 - in /httpd/httpd/trunk/server/mpm/event: config.m4 event.c
Date Thu, 17 Nov 2011 22:48:36 GMT
Author: trawick
Date: Thu Nov 17 22:48:35 2011
New Revision: 1203404

URL: http://svn.apache.org/viewvc?rev=1203404&view=rev
Log:
event no longer requires APR_POLLSET_THREADSAFE, or any
other non-standard feature (all but OS/2 have APR_POLLSET_WAKEABLE)

config-foo: don't require thread-safe pollset in order to
            build event

event.c: don't stress APR_ENOTIMPL in apr_pollset_create errors;
         just give the standard "check system or user limits"
         message

Modified:
    httpd/httpd/trunk/server/mpm/event/config.m4
    httpd/httpd/trunk/server/mpm/event/event.c

Modified: httpd/httpd/trunk/server/mpm/event/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/config.m4?rev=1203404&r1=1203403&r2=1203404&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/config.m4 (original)
+++ httpd/httpd/trunk/server/mpm/event/config.m4 Thu Nov 17 22:48:35 2011
@@ -5,8 +5,6 @@ elif test $ac_cv_define_APR_HAS_THREADS 
     AC_MSG_RESULT(no - APR does not support threads)
 elif test $have_threaded_sig_graceful != yes; then
     AC_MSG_RESULT(no - SIG_GRACEFUL cannot be used with a threaded MPM)
-elif test $ac_cv_have_threadsafe_pollset != yes; then
-    AC_MSG_RESULT(no - APR_POLLSET_THREADSAFE is not supported)
 else
     AC_MSG_RESULT(yes)
     APACHE_MPM_SUPPORTED(event, yes, yes)

Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1203404&r1=1203403&r2=1203404&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Thu Nov 17 22:48:35 2011
@@ -1950,7 +1950,7 @@ static void *APR_THREAD_FUNC start_threa
                             pchild, APR_POLLSET_WAKEABLE|APR_POLLSET_NOCOPY);
     if (rv != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_ERR, rv, ap_server_conf,
-                     "apr_pollset_create with Thread Safety failed.");
+                     "apr_pollset_create failed; check system or user limits");
         clean_child_exit(APEXIT_CHILDFATAL);
     }
 
@@ -2866,9 +2866,7 @@ static int event_pre_config(apr_pool_t *
                                 APR_POLLSET_WAKEABLE|APR_POLLSET_NOCOPY);
         if (rv != APR_SUCCESS) {
             ap_log_error(APLOG_MARK, APLOG_CRIT, rv, NULL,
-                         "Couldn't create a suitable pollset. "
-                         "Is it supported on your platform?"
-                         "Also check system or user limits!");
+                         "apr_pollset_create failed; check system or user limits");
             return HTTP_INTERNAL_SERVER_ERROR;
         }
         apr_pollset_destroy(event_pollset);



Mime
View raw message