mpm_event: Use async_factor instead of worker_factor (no functional change).

Author: ylavic

server/mpm/event/event.c

@@ -168,11 +168,11 @@
  * Actual definitions of config globals
  */
 
-#ifndef DEFAULT_WORKER_FACTOR
-#define DEFAULT_WORKER_FACTOR 2
+#ifndef DEFAULT_ASYNC_FACTOR
+#define DEFAULT_ASYNC_FACTOR 2
 #endif
 #define WORKER_FACTOR_SCALE   16  /* scale factor to allow fractional values */
-static unsigned int worker_factor = DEFAULT_WORKER_FACTOR * WORKER_FACTOR_SCALE;
+static apr_uint32_t async_factor = DEFAULT_ASYNC_FACTOR;
     /* AsyncRequestWorkerFactor * 16 */
 
 static int threads_per_child = 0;           /* ThreadsPerChild */
@@ -675,7 +675,7 @@ static APR_INLINE int connections_above_limit(int *busy)
                 /* Off by 'listeners_disabled()' to avoid flip flop */
                 || c_count - l_count < (apr_uint32_t)threads_per_child +
                                        (i_count - listeners_disabled()) *
-                                       (worker_factor / WORKER_FACTOR_SCALE)) {
+                                       async_factor) {
             return 0;
         }
     }
@@ -2880,7 +2880,6 @@ static void setup_threads_runtime(void)
                                  APR_POLLSET_PORT,
                                  APR_POLLSET_EPOLL };
     /* XXX: K-A or lingering close connection included in the async factor */
-    const apr_uint32_t async_factor = worker_factor / WORKER_FACTOR_SCALE;
     const apr_uint32_t pollset_size = (apr_uint32_t)num_listensocks +
                                       (apr_uint32_t)threads_per_child *
                                       (async_factor > 2 ? async_factor : 2);
@@ -4639,6 +4638,7 @@ static const char *set_worker_factor(cmd_parms * cmd, void *dummy,
 {
     double val;
     char *endptr;
+    apr_uint32_t factor;
     const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
     if (err != NULL) {
         return err;
@@ -4651,9 +4651,10 @@ static const char *set_worker_factor(cmd_parms * cmd, void *dummy,
     if (val <= 0)
         return "AsyncRequestWorkerFactor argument must be a positive number";
 
-    worker_factor = val * WORKER_FACTOR_SCALE;
-    if (worker_factor < WORKER_FACTOR_SCALE) {
-        worker_factor = WORKER_FACTOR_SCALE;
+    factor = val * WORKER_FACTOR_SCALE;
+    async_factor = factor / WORKER_FACTOR_SCALE;
+    if (async_factor < 1) {
+        async_factor = 1;
     }
     return NULL;
 }