Commit 3848b08d authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Add additional query datum to the MPMs.
  Harrie Hazewinkel <harrie@covalent.net>


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

include/ap_mpm.h

+12 −6
Original line number Diff line number Diff line
@@ -164,6 +164,12 @@ AP_DECLARE(apr_status_t) ap_os_create_privileged_process( 
#define AP_MPMQ_HARD_LIMIT_DAEMONS    4  /* The compiled max # deamons   */

#define AP_MPMQ_HARD_LIMIT_THREADS    5  /* The compiled max # threads   */

#define AP_MPMQ_MAX_THREADS           6  /* Max # of threads             */

#define AP_MPMQ_MIN_SPARE_DEAMONS     7  /* Min # of spare daemons       */

#define AP_MPMQ_MIN_SPARE_THREADS     8  /* Min # of spare threads       */

#define AP_MPMQ_MAX_SPARE_DAEMONS     9  /* Max # of spare daemons       */

#define AP_MPMQ_MAX_SPARE_THREADS    10  /* Max # of spare threads       */

#define AP_MPMQ_MAX_REQUESTS_DEAMON  11  /* Max # of requests per daemon */





/**

 * Query a property of the current MPM.

server/mpm/beos/beos.c

+15 −0
Original line number Diff line number Diff line
@@ -671,6 +671,21 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) 
        case AP_MPMQ_MAX_THREADS:

            *result = ap_threads_per_child;

            return APR_SUCCESS;

        case AP_MPMQ_MIN_SPARE_DEAMONS:

            *result = 0;

            return APR_SUCCESS;

        case AP_MPMQ_MIN_SPARE_THREADS:    

            *result = max_spare_threads;

            return APR_SUCCESS;

        case AP_MPMQ_MAX_SPARE_DAEMONS:

            *result = 0;

            return APR_SUCCESS;

        case AP_MPMQ_MAX_SPARE_THREADS:

            *result = min_spare_threads;

            return APR_SUCCESS;

        case AP_MPMQ_MAX_REQUESTS_DEAMON:

            *result = ap_max_requests_per_child;

            return APR_SUCCESS;

    }

    return APR_ENOTIMPL;

}

server/mpm/experimental/perchild/perchild.c

+15 −0
Original line number Diff line number Diff line
@@ -240,6 +240,21 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) 
        case AP_MPMQ_MAX_THREADS:

            *result = max_threads;

            return APR_SUCCESS;

        case AP_MPMQ_MIN_SPARE_DEAMONS:

            *result = 0;

            return APR_SUCCESS;

        case AP_MPMQ_MIN_SPARE_THREADS:    

            *result = min_spare_threads;

            return APR_SUCCESS;

        case AP_MPMQ_MAX_SPARE_DAEMONS:

            *result = 0;

            return APR_SUCCESS;

        case AP_MPMQ_MAX_SPARE_THREADS:

            *result = max_spare_threads;

            return APR_SUCCESS;

        case AP_MPMQ_MAX_REQUESTS_DEAMON:

            *result = max_requests_per_child;

            return APR_SUCCESS; 

    }

    return APR_ENOTIMPL;

}

server/mpm/perchild/perchild.c

+15 −0
Original line number Diff line number Diff line
@@ -240,6 +240,21 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) 
        case AP_MPMQ_MAX_THREADS:

            *result = max_threads;

            return APR_SUCCESS;

        case AP_MPMQ_MIN_SPARE_DEAMONS:

            *result = 0;

            return APR_SUCCESS;

        case AP_MPMQ_MIN_SPARE_THREADS:    

            *result = min_spare_threads;

            return APR_SUCCESS;

        case AP_MPMQ_MAX_SPARE_DAEMONS:

            *result = 0;

            return APR_SUCCESS;

        case AP_MPMQ_MAX_SPARE_THREADS:

            *result = max_spare_threads;

            return APR_SUCCESS;

        case AP_MPMQ_MAX_REQUESTS_DEAMON:

            *result = max_requests_per_child;

            return APR_SUCCESS; 

    }

    return APR_ENOTIMPL;

}

server/mpm/prefork/prefork.c

+15 −0
Original line number Diff line number Diff line
@@ -333,6 +333,21 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) 
        case AP_MPMQ_MAX_THREADS:

            *result = 0;

            return APR_SUCCESS;

        case AP_MPMQ_MIN_SPARE_DEAMONS:

            *result = ap_daemons_min_free;

            return APR_SUCCESS;

        case AP_MPMQ_MIN_SPARE_THREADS:

            *result = 0;

            return APR_SUCCESS;

        case AP_MPMQ_MAX_SPARE_DAEMONS:

            *result = ap_daemons_max_free;

            return APR_SUCCESS;

        case AP_MPMQ_MAX_SPARE_THREADS:

            *result = 0;

            return APR_SUCCESS;

        case AP_MPMQ_MAX_REQUESTS_DEAMON:

            *result = ap_max_requests_per_child;

            return APR_SUCCESS;

    }

    return APR_ENOTIMPL;

}