Clean up thread and process number defaults

for simple mpm.

- Before, simple wouldn't start without explicit
  config, because default numbers were 0
- log messages "more" and "less" were misleading

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

diff --git a/server/mpm/simple/simple_api.c b/server/mpm/simple/simple_api.c
index 07cd9f0d0fcd690dc28a721d7826c663397cb179..db9b2f7f1bac2babeab01a0e869bbb8d630b7e0c 100644 (file)
--- a/server/mpm/simple/simple_api.c
+++ b/server/mpm/simple/simple_api.c
@@ -185,12 +185,6 @@ static void simple_process_start(process_rec * process)
     ap_mpm_rewrite_args(process);
 }
 
-#define SIMPLE_MAX_PROC (500000)
-#define SIMPLE_MIN_PROC (1)
-
-#define SIMPLE_MAX_THREADS (500000)
-#define SIMPLE_MIN_THREADS (1)
-
 static int
 simple_check_config(apr_pool_t * p, apr_pool_t * plog,
                     apr_pool_t * ptemp, server_rec * s)
@@ -199,28 +193,28 @@ simple_check_config(apr_pool_t * p, apr_pool_t * plog,
 
     if (sc->procmgr.proc_count > SIMPLE_MAX_PROC) {
         ap_log_error(APLOG_MARK, APLOG_CRIT, 0, s,
-                     "simple_check_config: SimpleProcCount must be less than %d",
+                     "simple_check_config: SimpleProcCount must be at most %d",
                      SIMPLE_MAX_PROC);
         return !OK;
     }
 
     if (sc->procmgr.proc_count < SIMPLE_MIN_PROC) {
         ap_log_error(APLOG_MARK, APLOG_CRIT, 0, s,
-                     "simple_check_config: SimpleProcCount must be more than %d",
+                     "simple_check_config: SimpleProcCount must be at least %d",
                      SIMPLE_MIN_PROC);
         return !OK;
     }
 
     if (sc->procmgr.thread_count > SIMPLE_MAX_THREADS) {
         ap_log_error(APLOG_MARK, APLOG_CRIT, 0, s,
-                     "simple_check_config: SimpleThreadCount must be less than %d",
+                     "simple_check_config: SimpleThreadCount must be at most %d",
                      SIMPLE_MAX_THREADS);
         return !OK;
     }
 
     if (sc->procmgr.thread_count < SIMPLE_MIN_THREADS) {
         ap_log_error(APLOG_MARK, APLOG_CRIT, 0, s,
-                     "simple_check_config: SimpleThreadCount must be more than %d",
+                     "simple_check_config: SimpleThreadCount must be at least %d",
                      SIMPLE_MIN_THREADS);
         return !OK;
     }

diff --git a/server/mpm/simple/simple_core.c b/server/mpm/simple/simple_core.c
index cde9a85fa863a3c98c001e0e8ce37265096ce919..11b4f679a28a08ff07ffd11315f81bdb225c433d 100644 (file)
--- a/server/mpm/simple/simple_core.c
+++ b/server/mpm/simple/simple_core.c
@@ -46,6 +46,8 @@ apr_status_t simple_core_init(simple_core_t * sc, apr_pool_t * pool)
     apr_pool_tag(sc->pool, "simple-mpm-core");
 
     sc->mpm_state = AP_MPMQ_STARTING;
+    sc->procmgr.proc_count = SIMPLE_DEF_PROC;
+    sc->procmgr.thread_count = SIMPLE_DEF_THREADS;
     sc->procmgr.max_requests_per_child = DEFAULT_MAX_REQUESTS_PER_CHILD;
 
     sc->children = apr_hash_make(sc->pool);

diff --git a/server/mpm/simple/simple_types.h b/server/mpm/simple/simple_types.h
index db4205d1e027e1986a20a69264c893db40ba4cbc..814165873efea52d436bbed31f45b2d25fcb9862 100644 (file)
--- a/server/mpm/simple/simple_types.h
+++ b/server/mpm/simple/simple_types.h
@@ -35,6 +35,13 @@ typedef struct
     int max_requests_per_child;
 } simple_proc_mgr_t;
 
+#define SIMPLE_MAX_PROC (500000)
+#define SIMPLE_DEF_PROC (5)
+#define SIMPLE_MIN_PROC (1)
+#define SIMPLE_MAX_THREADS (500000)
+#define SIMPLE_DEF_THREADS (5)
+#define SIMPLE_MIN_THREADS (1)
+
 typedef void (*simple_timer_cb) (simple_core_t * sc, void *baton);
 typedef void (*simple_io_sock_cb) (simple_core_t * sc, apr_socket_t * sock,
                                    int flags, void *baton);