You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2018/01/18 18:40:09 UTC
svn commit: r1821541 - in /httpd/httpd/trunk/server: mpm/event/event.c
mpm_unix.c mpm_unix.h
Author: ylavic
Date: Thu Jan 18 18:40:09 2018
New Revision: 1821541
URL: http://svn.apache.org/viewvc?rev=1821541&view=rev
Log:
Follow up to r1821526: rename ap_queue_info_get_idlers to ap_queue_info_num_idlers.
Modified:
httpd/httpd/trunk/server/mpm/event/event.c
httpd/httpd/trunk/server/mpm_unix.c
httpd/httpd/trunk/server/mpm_unix.h
Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1821541&r1=1821540&r2=1821541&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Thu Jan 18 18:40:09 2018
@@ -510,7 +510,7 @@ static void enable_listensocks(int proce
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 proce
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_t
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) {
Modified: httpd/httpd/trunk/server/mpm_unix.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_unix.c?rev=1821541&r1=1821540&r2=1821541&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm_unix.c (original)
+++ httpd/httpd/trunk/server/mpm_unix.c Thu Jan 18 18:40:09 2018
@@ -1301,7 +1301,7 @@ apr_status_t ap_queue_info_wait_for_idle
}
}
-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);
Modified: httpd/httpd/trunk/server/mpm_unix.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_unix.h?rev=1821541&r1=1821540&r2=1821541&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm_unix.h (original)
+++ httpd/httpd/trunk/server/mpm_unix.h Thu Jan 18 18:40:09 2018
@@ -50,9 +50,8 @@ apr_status_t ap_queue_info_set_idle(fd_q
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);