Commit 8dbdd95c authored by Evgeny Kotkov's avatar Evgeny Kotkov
Browse files

mpm_winnt: Drop the APLOG_DEBUG diagnostic saying how many thread 

are blocked on the I/O completion port during the shutdown.

Prior to r1801635, the shutdown code required to know the amount of blocked
threads, as it has been dispatching the same amount of completion packets.
But this no longer holds, and the only reason why we maintain the
corresponding g_blocked_threads variable is because of this debug
diagnostic message.

Drop it in order to reduce complexity of the quite critical code in the
winnt_get_connection() function and to reduce the amount of global
variables.


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

server/mpm/winnt/child.c

+0 −12
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ typedef enum { 
static apr_pool_t *pchild;

static int shutdown_in_progress = 0;

static int workers_may_exit = 0;

static unsigned int g_blocked_threads = 0;

static HANDLE max_requests_per_child_event;



static apr_thread_mutex_t  *child_lock;
@@ -737,10 +736,8 @@ static winnt_conn_ctx_t *winnt_get_connection(winnt_conn_ctx_t *context) 


    mpm_recycle_completion_context(context);



    apr_atomic_inc32(&g_blocked_threads);

    while (1) {

        if (workers_may_exit) {

            apr_atomic_dec32(&g_blocked_threads);

            return NULL;

        }

        rc = GetQueuedCompletionStatus(ThreadDispatchIOCP, &BytesRead,
@@ -758,15 +755,12 @@ static winnt_conn_ctx_t *winnt_get_connection(winnt_conn_ctx_t *context) 
            context = CONTAINING_RECORD(pol, winnt_conn_ctx_t, overlapped);

            break;

        case IOCP_SHUTDOWN:

            apr_atomic_dec32(&g_blocked_threads);

            return NULL;

        default:

            apr_atomic_dec32(&g_blocked_threads);

            return NULL;

        }

        break;

    }

    apr_atomic_dec32(&g_blocked_threads);



    return context;

}
@@ -1162,12 +1156,6 @@ void child_main(apr_pool_t *pconf, DWORD parent_pid) 
    /* Shutdown the worker threads by posting a number of IOCP_SHUTDOWN

     * completion packets equal to the amount of created threads

     */

    if (g_blocked_threads > 0) {

        ap_log_error(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, ap_server_conf, APLOGNO(00361)

                     "Child: %d threads blocked on the completion port",

                     g_blocked_threads);

    }



    for (i = 0; i < threads_created; i++) {

        PostQueuedCompletionStatus(ThreadDispatchIOCP, 0, IOCP_SHUTDOWN, NULL);

    }