Commit a9077d1c authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1757061, r1770750 from trunk: 

ap_reclaim_child_processes() ignores its first argument

note this in the docs, add comment


ap_reclaim_child_processes(): Implement terminate immediately

The behavior for terminate == 1 was documented but not implemented. Do
that now.



Submitted by: sf
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1772332 13f79535-47bb-0310-9956-ffa450edef68
parent 92230a27

STATUS

+0 −7
Original line number Diff line number Diff line
@@ -117,13 +117,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) ap_reclaim_child_processes(): Implement terminate immediately

     trunk patches:

       https://svn.apache.org/r1757061

       https://svn.apache.org/r1770750

     2.4.x patch: https://people.apache.org/~sf/PR53555_1_ap_reclaim_child_processes.diff

     +1: sf, jim, wrowe



  *) Improve mod_status view of async connections

     trunk patches:

       https://svn.apache.org/r1738628

server/mpm_unix.c

+21 −10
Original line number Diff line number Diff line
@@ -63,7 +63,13 @@ 
#undef APLOG_MODULE_INDEX

#define APLOG_MODULE_INDEX AP_CORE_MODULE_INDEX



typedef enum {DO_NOTHING, SEND_SIGTERM, SEND_SIGKILL, GIVEUP} action_t;

typedef enum {

    DO_NOTHING,

    SEND_SIGTERM,

    SEND_SIGTERM_NOLOG,

    SEND_SIGKILL,

    GIVEUP

} action_t;



typedef struct extra_process_t {

    struct extra_process_t *next;
@@ -142,6 +148,8 @@ static int reclaim_one_pid(pid_t pid, action_t action) 
                     " still did not exit, "

                     "sending a SIGTERM",

                     pid);

        /* FALLTHROUGH */

    case SEND_SIGTERM_NOLOG:

        kill(pid, SIGTERM);

        break;
@@ -193,6 +201,7 @@ AP_DECLARE(void) ap_reclaim_child_processes(int terminate, 
                          * children but take no action against

                          * stragglers

                          */

        {SEND_SIGTERM_NOLOG, 0}, /* skipped if terminate == 0 */

        {SEND_SIGTERM, apr_time_from_sec(3)},

        {SEND_SIGTERM, apr_time_from_sec(5)},

        {SEND_SIGTERM, apr_time_from_sec(7)},
@@ -202,11 +211,12 @@ AP_DECLARE(void) ap_reclaim_child_processes(int terminate, 
    int cur_action;      /* index of action we decided to take this

                          * iteration

                          */

    int next_action = 1; /* index of first real action */

    int next_action = terminate ? 1 : 2; /* index of first real action */



    ap_mpm_query(AP_MPMQ_MAX_DAEMON_USED, &max_daemons);



    do {

        if (action_table[next_action].action_time > 0) {

            apr_sleep(waittime);

            /* don't let waittime get longer than 1 second; otherwise, we don't

             * react quickly to the last child exiting, and taking action can
@@ -216,6 +226,7 @@ AP_DECLARE(void) ap_reclaim_child_processes(int terminate, 
            if (waittime > apr_time_from_sec(1)) {

                waittime = apr_time_from_sec(1);

            }

        }



        /* see what action to take, if any */

        if (action_table[next_action].action_time <= apr_time_now() - starttime) {