From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 19 Jan 2018 12:20:44 +0000 (+0000)
Subject: mpm_fdqueue: follow up to r1821624.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2942
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ef30515cf7fccd54782baa672985717637c501d;p=thirdparty%2Fapache%2Fhttpd.git

mpm_fdqueue: follow up to r1821624.

Rename ap_queue_info_get_idlers() to ap_queue_info_num_idlers().



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

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 567dcfbabb9..871b1583acc 100644
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -517,7 +517,7 @@ static void enable_listensocks(void)
                  apr_atomic_read32(&lingering_count),
                  apr_atomic_read32(&clogged_count),
                  apr_atomic_read32(&suspended_count),
-                 ap_queue_info_get_idlers(worker_queue_info));
+                 ap_queue_info_num_idlers(worker_queue_info));
     for (i = 0; i < num_listensocks; i++)
         apr_pollset_add(event_pollset, &listener_pollfd[i]);
     /*
@@ -534,7 +534,7 @@ static APR_INLINE apr_uint32_t listeners_disabled(void)
 
 static APR_INLINE int connections_above_limit(void)
 {
-    apr_uint32_t i_count = ap_queue_info_get_idlers(worker_queue_info);
+    apr_uint32_t i_count = ap_queue_info_num_idlers(worker_queue_info);
     if (i_count > 0) {
         apr_uint32_t c_count = apr_atomic_read32(&connection_count);
         apr_uint32_t l_count = apr_atomic_read32(&lingering_count);
@@ -2042,7 +2042,7 @@ static void * APR_THREAD_FUNC listener_thread(apr_thread_t * thd, void *dummy)
                                  apr_atomic_read32(&connection_count));
                     ap_log_error(APLOG_MARK, APLOG_TRACE1, 0, ap_server_conf,
                                  "Idle workers: %u",
-                                 ap_queue_info_get_idlers(worker_queue_info));
+                                 ap_queue_info_num_idlers(worker_queue_info));
                     workers_were_busy = 1;
                 }
                 else if (!listener_may_exit) {
diff --git a/server/mpm_fdqueue.c b/server/mpm_fdqueue.c
index 8f7696ecc45..fbc08954b2d 100644
--- a/server/mpm_fdqueue.c
+++ b/server/mpm_fdqueue.c
@@ -207,7 +207,7 @@ apr_status_t ap_queue_info_wait_for_idler(fd_queue_info_t *queue_info,
     }
 }
 
-apr_uint32_t ap_queue_info_get_idlers(fd_queue_info_t *queue_info)
+apr_uint32_t ap_queue_info_num_idlers(fd_queue_info_t *queue_info)
 {
     apr_uint32_t val;
     val = apr_atomic_read32(&queue_info->idlers);
diff --git a/server/mpm_fdqueue.h b/server/mpm_fdqueue.h
index d203535c7a2..b68b9223c4a 100644
--- a/server/mpm_fdqueue.h
+++ b/server/mpm_fdqueue.h
@@ -51,9 +51,8 @@ apr_status_t ap_queue_info_set_idle(fd_queue_info_t *queue_info,
 apr_status_t ap_queue_info_try_get_idler(fd_queue_info_t *queue_info);
 apr_status_t ap_queue_info_wait_for_idler(fd_queue_info_t *queue_info,
                                           int *had_to_block);
+apr_uint32_t ap_queue_info_num_idlers(fd_queue_info_t *queue_info);
 apr_status_t ap_queue_info_term(fd_queue_info_t *queue_info);
-apr_uint32_t ap_queue_info_get_idlers(fd_queue_info_t *queue_info);
-void ap_free_idle_pools(fd_queue_info_t *queue_info);
 
 typedef struct timer_event_t timer_event_t;
 
@@ -83,6 +82,7 @@ typedef struct fd_queue_t fd_queue_t;
 
 void ap_pop_pool(apr_pool_t **recycled_pool, fd_queue_info_t *queue_info);
 void ap_push_pool(fd_queue_info_t *queue_info, apr_pool_t *pool_to_recycle);
+void ap_free_idle_pools(fd_queue_info_t *queue_info);
 
 apr_status_t ap_queue_init(fd_queue_t *queue, int queue_capacity,
                            apr_pool_t *a);