Commit 91f92d79 authored by Yann Ylavic's avatar Yann Ylavic
Browse files

Merge r1821624, r1821625, r1821626, r1821627, r1821629, r1821632, r1821635,... 

Merge r1821624, r1821625, r1821626, r1821627, r1821629, r1821632, r1821635, r1821639, r1821644, r1821647, r1821648, r1821649, r1821650, r1821651, r1821659, r1821660, r1822366, r1822367, r1824381 from trunk:

Shared fdqueue code between MPMs event and worker into mpm_fdqueue.

This first step moves the files server/mpm/event/fdqueue.[ch] to
server/mpm_fdqueue.[ch] (untouched for now, simple svn move).

Will follow up with the necessary changes to mpm_unix.* for common code.


mpm_fdqueue: follow up to r1821624.

And now it's mpm_fdqueue, with minimal #includes.


mpm_fdqueue: follow up to r1821624.

Opacify fdqueue types.


mpm_fdqueue: follow up to r1821624.

Style, no functional change.


mpm_fdqueue: follow up to r1821624.

Rename ap_queue_info_get_idlers() to ap_queue_info_num_idlers().


mpm_fdqueue: follow up to r1821624.

Clear recycled_pools_count in ap_free_idle_pools().


mpm_fdqueue: follow up to r1821624.

Prepare mpm_worker to use common fdqueue.


mpm_worker: follow up to r1821624.

Use common [mpm_]fdqueue.


mpm_fdqueue: follow up to r1821624.

The implemention wants APR_HAS_THREADS too.


mpm_fdqueue: follow up to r1821624.

The code is not part of the API.


mpm_fdqueue: follow up to r1821624.

Fix typo in comment.


mpm_fdqueue: follow up to r1821624.

Cosmetics, 80 cols, no functional change.


mpm_worker: follow up to r1821624.

Free idle pools while stopping.


mpm_fdqueue: follow up to r1821624.

Be explicit in the naming about what's push/pop-ed.


mpm_fdqueue: follow up to r1821624.

Either error matters, simplify code.


mpm_fdqueue: follow up to r1821624.

Make the allocation and zero-ing in ap_queue_init() => ap_queue_create().


mpm_fdqueue: follow up to r1821624.

Export ap_queue_*() fonctions, so that they are accessible from MPMs, but
don't provide "mpm_fdqueue.h" in the API (include/).


mpm_fdqueue: follow up to r1821624.

80 colums.


Follow up to r1821624: CHANGES entry.


Submitted by: ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-mpm_fdqueue@1824384 13f79535-47bb-0310-9956-ffa450edef68
parent 9d79ecd2

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.4.30



  *) mpm_queue: Put fdqueue code in common for MPMs event and worker.

     [Yann Ylavic]



  *) mod_proxy: Allow setting options to globally defined balancer from

     ProxyPass used in VirtualHost. Balancers are now merged using the new

     merge_balancers method which merges the balancers options.  [Jan Kaluza]

server/Makefile.in

+3 −1
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ LTLIBRARY_NAME = libmain.la 
LTLIBRARY_SOURCES = \

	config.c log.c main.c vhost.c util.c util_fcgi.c \

	util_script.c util_md5.c util_cfgtree.c util_ebcdic.c util_time.c \

	connection.c listen.c util_mutex.c mpm_common.c mpm_unix.c \

	connection.c listen.c util_mutex.c \

	mpm_common.c mpm_unix.c mpm_fdqueue.c \

	util_charset.c util_cookies.c util_debug.c util_xml.c \

	util_filter.c util_pcre.c util_regex.c exports.c \

	scoreboard.c error_bucket.c protocol.c core.c request.c provider.c \
@@ -58,6 +59,7 @@ export_files: 
	( for dir in $(EXPORT_DIRS); do \

	      ls $$dir/*.h ; \

	  done; \

	  echo "$(top_srcdir)/server/mpm_fdqueue.h"; \

	  for dir in $(EXPORT_DIRS_APR); do \

	      ls $$dir/ap[ru].h $$dir/ap[ru]_*.h 2>/dev/null; \

	  done; \

server/mpm/event/config3.m4

+1 −1
Original line number Diff line number Diff line
@@ -2,6 +2,6 @@ dnl ## XXX - Need a more thorough check of the proper flags to use 


APACHE_SUBST(MOD_MPM_EVENT_LDADD)



APACHE_MPM_MODULE(event, $enable_mpm_event, event.lo fdqueue.lo,[

APACHE_MPM_MODULE(event, $enable_mpm_event, event.lo,[

    AC_CHECK_FUNCS(pthread_kill)

], , [\$(MOD_MPM_EVENT_LDADD)])

server/mpm/event/event.c

+26 −24
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ 
#include "mpm_common.h"

#include "ap_listen.h"

#include "scoreboard.h"

#include "fdqueue.h"

#include "mpm_fdqueue.h"

#include "mpm_default.h"

#include "http_vhost.h"

#include "unixd.h"
@@ -212,6 +212,8 @@ static apr_pollfd_t *listener_pollfd; 
 */

static apr_pollset_t *event_pollset;



typedef struct event_conn_state_t event_conn_state_t;



/*

 * The chain of connections to be shutdown by a worker thread (deferred),

 * linked list updated atomically.
@@ -486,7 +488,7 @@ static void enable_listensocks(void) 
                 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]);

    /*
@@ -503,7 +505,7 @@ static APR_INLINE apr_uint32_t listeners_disabled(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) {

        apr_uint32_t c_count = apr_atomic_read32(&connection_count);

        apr_uint32_t l_count = apr_atomic_read32(&lingering_count);
@@ -804,7 +806,7 @@ static int start_lingering_close_blocking(event_conn_state_t *cs) 
    if (ap_start_lingering_close(cs->c)) {

        notify_suspend(cs);

        apr_socket_close(csd);

        ap_push_pool(worker_queue_info, cs->p);

        ap_queue_info_push_pool(worker_queue_info, cs->p);

        return 0;

    }
@@ -847,7 +849,7 @@ static int start_lingering_close_blocking(event_conn_state_t *cs) 
        ap_log_error(APLOG_MARK, APLOG_ERR, rv, ap_server_conf, APLOGNO(03092)

                     "start_lingering_close: apr_pollset_add failure");

        apr_socket_close(cs->pfd.desc.s);

        ap_push_pool(worker_queue_info, cs->p);

        ap_queue_info_push_pool(worker_queue_info, cs->p);

        return 0;

    }

    apr_thread_mutex_unlock(timeout_mutex);
@@ -888,7 +890,7 @@ static int stop_lingering_close(event_conn_state_t *cs) 
    ap_log_error(APLOG_MARK, APLOG_TRACE4, 0, ap_server_conf,

                 "socket reached timeout in lingering-close state");

    abort_socket_nonblocking(csd);

    ap_push_pool(worker_queue_info, cs->p);

    ap_queue_info_push_pool(worker_queue_info, cs->p);

    if (dying)

        ap_queue_interrupt_one(worker_queue);

    return 0;
@@ -979,7 +981,7 @@ static void process_socket(apr_thread_t *thd, apr_pool_t * p, apr_socket_t * soc 
        c = ap_run_create_connection(p, ap_server_conf, sock,

                                     conn_id, cs->sbh, cs->bucket_alloc);

        if (!c) {

            ap_push_pool(worker_queue_info, p);

            ap_queue_info_push_pool(worker_queue_info, p);

            return;

        }

        apr_atomic_inc32(&connection_count);
@@ -1143,7 +1145,7 @@ read_request: 
                             "process_socket: apr_pollset_add failure for "

                             "write completion");

                apr_socket_close(cs->pfd.desc.s);

                ap_push_pool(worker_queue_info, cs->p);

                ap_queue_info_push_pool(worker_queue_info, cs->p);

            }

            else {

                apr_thread_mutex_unlock(timeout_mutex);
@@ -1192,7 +1194,7 @@ read_request: 
                         "process_socket: apr_pollset_add failure for "

                         "keep alive");

            apr_socket_close(cs->pfd.desc.s);

            ap_push_pool(worker_queue_info, cs->p);

            ap_queue_info_push_pool(worker_queue_info, cs->p);

            return;

        }

        apr_thread_mutex_unlock(timeout_mutex);
@@ -1234,7 +1236,7 @@ static void close_listeners(int *closed) 
        /* wake up the main thread */

        kill(ap_my_pid, SIGTERM);



        ap_free_idle_pools(worker_queue_info);

        ap_queue_info_free_idle_pools(worker_queue_info);

        ap_queue_interrupt_all(worker_queue);

    }

}
@@ -1308,10 +1310,10 @@ static apr_status_t push2worker(event_conn_state_t *cs, apr_socket_t *csd, 
        csd = cs->pfd.desc.s;

        ptrans = cs->p;

    }

    rc = ap_queue_push(worker_queue, csd, cs, ptrans);

    rc = ap_queue_push_socket(worker_queue, csd, cs, ptrans);

    if (rc != APR_SUCCESS) {

        ap_log_error(APLOG_MARK, APLOG_CRIT, rc, ap_server_conf, APLOGNO(00471)

                     "push2worker: ap_queue_push failed");

                     "push2worker: ap_queue_push_socket failed");

        /* trash the connection; we couldn't queue the connected

         * socket to a worker

         */
@@ -1319,7 +1321,7 @@ static apr_status_t push2worker(event_conn_state_t *cs, apr_socket_t *csd, 
            abort_socket_nonblocking(csd);

        }

        if (ptrans) {

            ap_push_pool(worker_queue_info, ptrans);

            ap_queue_info_push_pool(worker_queue_info, ptrans);

        }

        signal_threads(ST_GRACEFUL);

    }
@@ -1482,7 +1484,7 @@ static void process_lingering_close(event_conn_state_t *cs, const apr_pollfd_t * 
    rv = apr_socket_close(csd);

    AP_DEBUG_ASSERT(rv == APR_SUCCESS);



    ap_push_pool(worker_queue_info, cs->p);

    ap_queue_info_push_pool(worker_queue_info, cs->p);

    if (dying)

        ap_queue_interrupt_one(worker_queue);

}
@@ -1810,14 +1812,14 @@ 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) {

                    void *csd = NULL;

                    ap_listen_rec *lr = (ap_listen_rec *) pt->baton;

                    apr_pool_t *ptrans;         /* Pool for per-transaction stuff */

                    ap_pop_pool(&ptrans, worker_queue_info);

                    ap_queue_info_pop_pool(worker_queue_info, &ptrans);



                    if (ptrans == NULL) {

                        /* create a new transaction pool for each accepted socket */
@@ -1868,7 +1870,7 @@ static void * APR_THREAD_FUNC listener_thread(apr_thread_t * thd, void *dummy) 
                        }

                    }

                    else {

                        ap_push_pool(worker_queue_info, ptrans);

                        ap_queue_info_push_pool(worker_queue_info, ptrans);

                    }

                }

            }               /* if:else on pt->type */
@@ -2038,7 +2040,8 @@ static void *APR_THREAD_FUNC worker_thread(apr_thread_t * thd, void *dummy) 
            break;

        }



        rv = ap_queue_pop_something(worker_queue, &csd, &cs, &ptrans, &te);

        rv = ap_queue_pop_something(worker_queue, &csd, (void **)&cs,

                                    &ptrans, &te);



        if (rv != APR_SUCCESS) {

            /* We get APR_EOF during a graceful shutdown once all the
@@ -2047,9 +2050,9 @@ static void *APR_THREAD_FUNC worker_thread(apr_thread_t * thd, void *dummy) 
            if (APR_STATUS_IS_EOF(rv)) {

                break;

            }

            /* We get APR_EINTR whenever ap_queue_pop() has been interrupted

            /* We get APR_EINTR whenever ap_queue_pop_*() has been interrupted

             * from an explicit call to ap_queue_interrupt_all(). This allows

             * us to unblock threads stuck in ap_queue_pop() when a shutdown

             * us to unblock threads stuck in ap_queue_pop_*() when a shutdown

             * is pending.

             *

             * If workers_may_exit is set and this is ungraceful termination/
@@ -2064,7 +2067,7 @@ static void *APR_THREAD_FUNC worker_thread(apr_thread_t * thd, void *dummy) 
            /* We got some other error. */

            else if (!workers_may_exit) {

                ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ap_server_conf,

                             APLOGNO(03099) "ap_queue_pop failed");

                             APLOGNO(03099) "ap_queue_pop_socket failed");

            }

            continue;

        }
@@ -2183,11 +2186,10 @@ static void *APR_THREAD_FUNC start_threads(apr_thread_t * thd, void *dummy) 


    /* We must create the fd queues before we start up the listener

     * and worker threads. */

    worker_queue = apr_pcalloc(pchild, sizeof(*worker_queue));

    rv = ap_queue_init(worker_queue, threads_per_child, pchild);

    rv = ap_queue_create(&worker_queue, threads_per_child, pchild);

    if (rv != APR_SUCCESS) {

        ap_log_error(APLOG_MARK, APLOG_ALERT, rv, ap_server_conf, APLOGNO(03100)

                     "ap_queue_init() failed");

                     "ap_queue_create() failed");

        clean_child_exit(APEXIT_CHILDFATAL);

    }

server/mpm/worker/config3.m4

+1 −1
Original line number Diff line number Diff line 
dnl ## XXX - Need a more thorough check of the proper flags to use



APACHE_MPM_MODULE(worker, $enable_mpm_worker, worker.lo fdqueue.lo,[

APACHE_MPM_MODULE(worker, $enable_mpm_worker, worker.lo,[

    AC_CHECK_FUNCS(pthread_kill)

])