www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-02 06:53:27 +03:00
Code Activity

Follow up to r1821526: rename ap_queue_info_get_idlers to ap_queue_info_num_idlers.

Browse Source 
[Reverted by r1821619]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821541 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2018-01-18 18:40:09 +00:00
parent d35f2f7675
commit 85695a624a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/mpm/event/event.c
View File

@@ -510,7 +510,7 @@ static void enable_listensocks(int process_slot)
apr_atomic_read32(&lingering_count), apr_atomic_read32(&lingering_count),
apr_atomic_read32(&clogged_count), apr_atomic_read32(&clogged_count),
apr_atomic_read32(&suspended_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++) for (i = 0; i < num_listensocks; i++)
apr_pollset_add(event_pollset, &listener_pollfd[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) 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) { if (i_count > 0) {
apr_uint32_t c_count = apr_atomic_read32(&connection_count); apr_uint32_t c_count = apr_atomic_read32(&connection_count);
apr_uint32_t l_count = apr_atomic_read32(&lingering_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)); apr_atomic_read32(&connection_count));
ap_log_error(APLOG_MARK, APLOG_TRACE1, 0, ap_server_conf, ap_log_error(APLOG_MARK, APLOG_TRACE1, 0, ap_server_conf,
"Idle workers: %u", "Idle workers: %u",
ap_queue_info_get_idlers(worker_queue_info)); ap_queue_info_num_idlers(worker_queue_info));
workers_were_busy = 1; workers_were_busy = 1;
} }
else if (!listener_may_exit) { else if (!listener_may_exit) {

2
server/mpm_unix.c
View File

@@ -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; apr_uint32_t val;
val = apr_atomic_read32(&queue_info->idlers); val = apr_atomic_read32(&queue_info->idlers);

4
server/mpm_unix.h
View File

@@ -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_try_get_idler(fd_queue_info_t *queue_info);
apr_status_t ap_queue_info_wait_for_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); 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_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; 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_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_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_status_t ap_queue_init(fd_queue_t *queue, int queue_capacity,
apr_pool_t *a); apr_pool_t *a);