You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ma...@hyperreal.org on 1999/07/24 00:43:49 UTC
cvs commit: apache-2.0/mpm/src/modules/mpm/dexter dexter.c mpm_default.h
manoj 99/07/23 15:43:48
Modified: mpm/src/modules/mpm/dexter dexter.c mpm_default.h
Log:
Clean up and properly specify defaults for the new directives.
Revision Changes Path
1.6 +8 -6 apache-2.0/mpm/src/modules/mpm/dexter/dexter.c
Index: dexter.c
===================================================================
RCS file: /home/cvs/apache-2.0/mpm/src/modules/mpm/dexter/dexter.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -u -r1.5 -r1.6
--- dexter.c 1999/07/23 22:20:20 1.5
+++ dexter.c 1999/07/23 22:43:47 1.6
@@ -78,10 +78,10 @@
* Actual definitions of config globals
*/
-static int threads_to_start=0; /* Worker threads per child */
-static int min_spare_threads=1;
-static int max_spare_threads=HARD_THREAD_LIMIT;
-static int max_requests_per_child=0;
+static int threads_to_start = 0; /* Worker threads per child */
+static int min_spare_threads = 0;
+static int max_spare_threads = 0;
+static int max_requests_per_child = 0;
static char *ap_pid_fname=NULL;
static int num_daemons=0;
static int workers_may_exit = 0;
@@ -1440,8 +1440,10 @@
unixd_pre_config();
ap_listen_pre_config();
- num_daemons = HARD_SERVER_LIMIT;
- threads_to_start = DEFAULT_THREADS_PER_CHILD;
+ num_daemons = DEFAULT_NUM_DAEMON;
+ threads_to_start = DEFAULT_START_THREAD;
+ min_spare_threads = DEFAULT_MIN_SPARE_THREAD;
+ max_spare_threads = DEFAULT_MAX_SPARE_THREAD;
ap_pid_fname = DEFAULT_PIDLOG;
ap_lock_fname = DEFAULT_LOCKFILE;
max_requests_per_child = DEFAULT_MAX_REQUESTS_PER_CHILD;
1.2 +25 -23 apache-2.0/mpm/src/modules/mpm/dexter/mpm_default.h
Index: mpm_default.h
===================================================================
RCS file: /home/cvs/apache-2.0/mpm/src/modules/mpm/dexter/mpm_default.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -u -r1.1 -r1.2
--- mpm_default.h 1999/07/21 19:07:06 1.1
+++ mpm_default.h 1999/07/23 22:43:47 1.2
@@ -58,25 +58,42 @@
#ifndef APACHE_MPM_DEFAULT_H
#define APACHE_MPM_DEFAULT_H
-/* Number of servers to spawn off by default --- also, if fewer than
+/* 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_DAEMON
-#define DEFAULT_START_DAEMON 5
+#ifndef DEFAULT_START_THREAD
+#define DEFAULT_START_THREAD 5
#endif
-/* Maximum number of *free* server processes --- more than this, and
+/* Maximum number of *free* server threads --- more than this, and
* they will die off.
*/
-#ifndef DEFAULT_MAX_FREE_DAEMON
-#define DEFAULT_MAX_FREE_DAEMON 10
+#ifndef DEFAULT_MAX_SPARE_THREAD
+#define DEFAULT_MAX_SPARE_THREAD 10
#endif
/* Minimum --- fewer than this, and more will be created */
-#ifndef DEFAULT_MIN_FREE_DAEMON
-#define DEFAULT_MIN_FREE_DAEMON 5
+#ifndef DEFAULT_MIN_SPARE_THREAD
+#define DEFAULT_MIN_SPARE_THREAD 5
+#endif
+
+/* Limit on the threads per process. Clients will be locked out if more than
+ * this * HARD_SERVER_LIMIT are needed.
+ *
+ * We keep this for one reason it keeps the size of the scoreboard file small
+ * enough that we can read the whole thing without worrying too much about
+ * the overhead.
+ */
+#ifndef HARD_THREAD_LIMIT
+#define HARD_THREAD_LIMIT 64
+#endif
+
+/* Number of servers to spawn off by default
+ */
+#ifndef DEFAULT_NUM_DAEMON
+#define DEFAULT_NUM_DAEMON 2
#endif
/* Limit on the total --- clients will be locked out if more servers than
@@ -92,21 +109,6 @@
*/
#ifndef HARD_SERVER_LIMIT
#define HARD_SERVER_LIMIT 8
-#endif
-
-/* Limit on the threads per process. Clients will be locked out if more than
- * this * HARD_SERVER_LIMIT are needed.
- *
- * We keep this for one reason it keeps the size of the scoreboard file small
- * enough that we can read the whole thing without worrying too much about
- * the overhead.
- */
-#ifndef HARD_THREAD_LIMIT
-#define HARD_THREAD_LIMIT 64
-#endif
-
-#ifndef DEFAULT_THREADS_PER_CHILD
-#define DEFAULT_THREADS_PER_CHILD 50
#endif
#endif /* AP_MPM_DEFAULT_H */