www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-10-28 20:34:59 +03:00
Code Activity

mpm_unix: Follow up to r1821526.

Browse Source 
Prepare mpm_worker to use common fdqueue.

[Reverted by r1821619]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821607 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2018-01-19 09:39:29 +00:00
parent 2ce4d05fc5
commit 56cfe4c25f
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/mpm_unix.c
View File

@@ -1274,7 +1274,9 @@ apr_status_t ap_queue_info_wait_for_idler(fd_queue_info_t *queue_info,
* threads are waiting on an idle worker.
*/
if (queue_info->idlers < zero_pt) {
*had_to_block = 1;
if (had_to_block) {
*had_to_block = 1;
}
rv = apr_thread_cond_wait(queue_info->wait_for_idler,
queue_info->idlers_mutex);
if (rv != APR_SUCCESS) {
@@ -1536,6 +1538,7 @@ apr_status_t ap_queue_pop_something(fd_queue_t *queue, apr_socket_t **sd,
timer_event_t **te_out)
{
fd_queue_elem_t *elem;
timer_event_t *te;
apr_status_t rv;
if ((rv = apr_thread_mutex_lock(queue->one_big_mutex)) != APR_SUCCESS) {
@@ -1562,20 +1565,24 @@ apr_status_t ap_queue_pop_something(fd_queue_t *queue, apr_socket_t **sd,
}
}
*te_out = NULL;
if (!APR_RING_EMPTY(&queue->timers, timer_event_t, link)) {
*te_out = APR_RING_FIRST(&queue->timers);
APR_RING_REMOVE(*te_out, link);
te = NULL;
if (te_out) {
if (!APR_RING_EMPTY(&queue->timers, timer_event_t, link)) {
te = APR_RING_FIRST(&queue->timers);
APR_RING_REMOVE(te, link);
}
*te_out = te;
}
else {
if (!te) {
elem = &queue->data[queue->out];
queue->out++;
if (queue->out >= queue->bounds)
queue->out -= queue->bounds;
queue->nelts--;
*sd = elem->sd;
*baton = elem->baton;
if (baton) {
*baton = elem->baton;
}
*p = elem->p;
#ifdef AP_DEBUG
elem->sd = NULL;