Commit 26085dc1 authored by Bradley Nicholes's avatar Bradley Nicholes
Browse files

NetWare MPM cleanup 


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

server/mpm/netware/mpm.h

+10 −9
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ 
 * University of Illinois, Urbana-Champaign.

 */

#include "scoreboard.h"

//#include "unixd.h"



#ifndef APACHE_MPM_THREADED_H

#define APACHE_MPM_THREADED_H
@@ -65,15 +64,17 @@ 


#define MPM_NAME "NetWare_Threaded"



//#define AP_MPM_WANT_RECLAIM_CHILD_PROCESSES

/*#define AP_MPM_WANT_RECLAIM_CHILD_PROCESSES

  #define AP_MPM_WANT_WAIT_OR_TIMEOUT

//#define AP_MPM_WANT_PROCESS_CHILD_STATUS

  #define AP_MPM_WANT_PROCESS_CHILD_STATUS

  #define AP_MPM_WANT_SET_PIDFILE

  #define AP_MPM_WANT_SET_SCOREBOARD

  #define AP_MPM_WANT_SET_LOCKFILE 

*/

#define AP_MPM_WANT_SET_MAX_REQUESTS

#define AP_MPM_WANT_SET_COREDUMPDIR

//#define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH

/*#define AP_MPM_WANT_SET_COREDUMPDIR

  #define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH 

*/



#define MPM_SYNC_CHILD_TABLE() (ap_sync_scoreboard_image())

#define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid)

server/mpm/netware/mpm_default.h

+31 −8
Original line number Diff line number Diff line
@@ -113,10 +113,32 @@ 
#define DEFAULT_THREADS_PER_CHILD 50

#endif



/* Number of threads to spawn off by default --- also, if fewer than

 * this free when the caretaker checks, it will spawn more.

 */

#ifndef DEFAULT_START_THREADS

#define DEFAULT_START_THREADS DEFAULT_THREADS_PER_CHILD

#endif



/* Maximum number of *free* threads --- more than this, and

 * they will die off.

 */



#ifndef DEFAULT_MAX_FREE_THREADS

#define DEFAULT_MAX_FREE_THREADS 100

#endif



/* Minimum --- fewer than this, and more will be created */



#ifndef DEFAULT_MIN_FREE_THREADS

#define DEFAULT_MIN_FREE_THREADS 10

#endif



/* File used for accept locking, when we use a file */

#ifndef DEFAULT_LOCKFILE

/*#ifndef DEFAULT_LOCKFILE

  #define DEFAULT_LOCKFILE "logs/accept.lock"

  #endif

*/



/* Scoreboard file, if there is one */

#ifndef DEFAULT_SCOREBOARD
@@ -124,22 +146,23 @@ 
#endif



/* Where the main/parent process's pid is logged */

#ifndef DEFAULT_PIDLOG

/*#ifndef DEFAULT_PIDLOG

  #define DEFAULT_PIDLOG "logs/httpd.pid"

  #endif

*/



/*

 * Interval, in microseconds, between scoreboard maintenance.

 */

#ifndef SCOREBOARD_MAINTENANCE_INTERVAL

#define SCOREBOARD_MAINTENANCE_INTERVAL 1000000

#define SCOREBOARD_MAINTENANCE_INTERVAL 15000

#endif



/* Number of requests to try to handle in a single process.  If <= 0,

 * the children don't die off.

 */

#ifndef DEFAULT_MAX_REQUESTS_PER_CHILD

#define DEFAULT_MAX_REQUESTS_PER_CHILD 10000

#define DEFAULT_MAX_REQUESTS_PER_CHILD 0

#endif



#endif /* AP_MPM_DEFAULT_H */

server/mpm/netware/mpm_netware.c

+246 −414

File changed.

Preview size limit exceeded, changes collapsed.