Follow up to r1821526: rename ap_queue_info_get_idlers to ap_queue_info_num_idlers.

[Reverted by r1821619]

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

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 5ee1ac207ab1bea32eeff280310cb963442c028f..989ac0bf8784369b209ca4ff4c37e0d11e146bd1 100644 (file)
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -510,7 +510,7 @@ static void enable_listensocks(int process_slot)
                  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]);
     /*
@@ -522,7 +522,7 @@ static void enable_listensocks(int process_slot)
 
 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);
@@ -2029,7 +2029,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_unix.c b/server/mpm_unix.c
index 0f87fc5a8a0cd9a22f741b72e660efa73a8883a7..b7e16e502419706a3ff4850a7cb437fa362ab364 100644 (file)
--- a/server/mpm_unix.c
+++ b/server/mpm_unix.c
@@ -1301,7 +1301,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_unix.h b/server/mpm_unix.h
index 979633ad41bf6e99d89c2c2a4fdc54f2c7e95885..e541c35bf1f7a6d92628e8410c8219bfa92d896e 100644 (file)
--- a/server/mpm_unix.h
+++ b/server/mpm_unix.h
@@ -50,9 +50,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;
 
@@ -82,6 +81,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);