Commit cbf9be17 authored by David Reid's avatar David Reid
Browse files

Get ONE_PROCESS working again for beos. 


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

server/mpm/beos/beos.c

+32 −24
Original line number Diff line number Diff line
@@ -814,7 +814,6 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) 
     * a seperate pool of it's own to use.

     */

    apr_pool_create(&pchild, pconf);

    ap_run_child_init(pchild, ap_server_conf);



    /* Now that we have the child pool (pchild) we can allocate

     * the listenfds and creat the pollset...
@@ -827,7 +826,10 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) 
	    listening_sockets[i]=lr->sd;



    /* we assume all goes OK...hmm might want to check that! */

    if (!is_graceful) {

    /* if we're in one_process mode we don't want to start threads

     * do we??

     */

    if (!is_graceful && !one_process) {

	    startup_threads(remaining_threads_to_start);

	    remaining_threads_to_start = 0;

    }
@@ -852,14 +854,34 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) 
    /*

     * main_loop until it's all over

     */

    if (!one_process) {

        server_main_loop(remaining_threads_to_start);

    

        tell_workers_to_exit(); /* if we get here we're exiting... */

        sleep(1); /* give them a brief chance to exit */

    } else {

        proc_info *my_info = (proc_info *)malloc(sizeof(proc_info));

        my_info->slot = 0;

        apr_pool_create(&my_info->tpool, pchild);

        worker_thread(my_info);

    }

        

    /* close the UDP socket we've been using... */

    apr_socket_close(listening_sockets[0]);



    if (one_process || shutdown_pending) {

        const char *pidfile = NULL;

        pidfile = ap_server_root_relative (pconf, ap_pid_fname);

        if ( pidfile != NULL && unlink(pidfile) == 0)

            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, 0, ap_server_conf,

                         "removed PID file %s (pid=%ld)", pidfile, 

                         (long)getpid());

    }



    if (one_process) {

        return 1;

    }

        

    /*

     * If we get here we're shutting down...

     */
@@ -871,17 +893,6 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) 
            ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf,

             "killpg SIGTERM");

      

        /* cleanup pid file on normal shutdown */

        {

            const char *pidfile = NULL;

            pidfile = ap_server_root_relative (pconf, ap_pid_fname);

            if ( pidfile != NULL && unlink(pidfile) == 0)

                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO,

            		 0, ap_server_conf,

            		 "removed PID file %s (pid=%ld)",

            		 pidfile, (long)getpid());

        }

        

        /* use ap_reclaim_child_processes starting with SIGTERM */

        ap_reclaim_child_processes(1);
@@ -895,10 +906,6 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) 
    /* we've been told to restart */

    signal(SIGHUP, SIG_IGN);



    if (one_process) {

        return 1;

    }



    if (is_graceful) {

        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, ap_server_conf,

		    "SIGWINCH received.  Doing graceful restart");
@@ -949,6 +956,7 @@ static void beos_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte 
    ap_threads_per_child = DEFAULT_THREADS_PER_CHILD;

    ap_pid_fname = DEFAULT_PIDLOG;

    ap_scoreboard_fname = DEFAULT_SCOREBOARD;

    if (!one_process) 

        ap_max_requests_per_child = DEFAULT_MAX_REQUESTS_PER_CHILD;



    apr_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));