httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/mpm/winnt mpm_winnt.c
Date Wed, 21 Jun 2000 13:15:31 GMT
trawick     00/06/21 06:15:31

  Modified:    src      CHANGES configure.in
               src/include mpm_common.h
               src/modules/mpm/dexter dexter.c
               src/modules/mpm/mpmt_beos mpmt_beos.c
               src/modules/mpm/mpmt_pthread mpmt_pthread.c
               src/modules/mpm/prefork prefork.c
               src/modules/mpm/spmt_os2 spmt_os2.c
               src/modules/mpm/winnt mpm_winnt.c
  Log:
  Fix error messages issued from MPMs which explain where to change
  compiled-in limits (e.g., ThreadsPerChild, MaxClients, StartTreads).
  
  missing: the same minor changes for the 2nd BeOS MPM
  
  Submitted by:	Greg Ames
  Reviewed by:	Jeff Trawick
  
  Revision  Changes    Path
  1.164     +4 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.163
  retrieving revision 1.164
  diff -u -r1.163 -r1.164
  --- CHANGES	2000/06/20 19:36:17	1.163
  +++ CHANGES	2000/06/21 13:15:25	1.164
  @@ -1,4 +1,8 @@
   Changes with Apache 2.0a5
  +  *) Fix error messages issued from MPMs which explain where to change
  +     compiled-in limits (e.g., ThreadsPerChild, MaxClients, StartTreads).
  +     [Greg Ames]
  +
     *) ap_create_pipe() now leaves pipes in blocking state.  (This helps 
        reduce the number of syscalls on Unix.)  ap_set_pipe_timeout() is
        now the way that the blocking state of a pipe is manipulated.
  
  
  
  1.61      +2 -0      apache-2.0/src/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/configure.in,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- configure.in	2000/06/17 11:13:03	1.60
  +++ configure.in	2000/06/21 13:15:25	1.61
  @@ -186,6 +186,7 @@
   echo "#define HTTPD_ROOT \"$prefix\"" >> ${path_h}.new
   echo "#define SUEXEC_BIN \"$bindir/suexec\"" >> ${path_h}.new
   echo "#define SERVER_CONFIG_FILE \"conf/$progname.conf\"" >> ${path_h}.new
  +echo "#define APACHE_MPM_DIR \"$mpmdir\"" >> ${path_h}.new
   
   cmp ${path_h}.new ${path_h} >/dev/null 2>&1
   if test $? -ne 0 ; then
  @@ -201,6 +202,7 @@
   exec_prefix=$exec_prefix
   bindir=$bindir
   progname=$progname
  +mpmdir=$MPM_DIR
   ])
   
   AC_TYPE_RLIM_T
  
  
  
  1.3       +2 -0      apache-2.0/src/include/mpm_common.h
  
  Index: mpm_common.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/mpm_common.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mpm_common.h	2000/05/24 00:41:58	1.2
  +++ mpm_common.h	2000/06/21 13:15:26	1.3
  @@ -77,6 +77,8 @@
   void ap_reclaim_child_processes(int terminate);
   void ap_wait_or_timeout(ap_wait_t *status, ap_proc_t *ret, ap_pool_t *p);
   
  +#define AP_MPM_HARD_LIMITS_FILE "src/" APACHE_MPM_DIR "/mpm_default.h"
  +
   #ifdef __cplusplus
   }
   #endif
  
  
  
  1.98      +7 -5      apache-2.0/src/modules/mpm/dexter/dexter.c
  
  Index: dexter.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
  retrieving revision 1.97
  retrieving revision 1.98
  diff -u -r1.97 -r1.98
  --- dexter.c	2000/06/20 19:16:14	1.97
  +++ dexter.c	2000/06/21 13:15:27	1.98
  @@ -1312,7 +1312,8 @@
                       " lowering NumServers to %d.  To increase, please "
                       "see the", HARD_SERVER_LIMIT);
          ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
  -                    " HARD_SERVER_LIMIT define in src/include/httpd.h.");
  +                    " HARD_SERVER_LIMIT define in %s.",
  +                    AP_MPM_HARD_LIMITS_FILE);
          num_daemons = HARD_SERVER_LIMIT;
       } 
       else if (num_daemons < 1) {
  @@ -1334,13 +1335,14 @@
       if (threads_to_start > HARD_THREAD_LIMIT) {
           ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
                        "WARNING: StartThreads of %d exceeds compile time"
  -                     "limit of %d threads,", threads_to_start,
  +                     " limit of %d threads,", threads_to_start,
                        HARD_THREAD_LIMIT);
           ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
  -                     "lowering StartThreads to %d. To increase, please"
  -                     "see the", HARD_THREAD_LIMIT);
  +                     " lowering StartThreads to %d. To increase, please"
  +                     " see the", HARD_THREAD_LIMIT);
           ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
  -                     "HARD_THREAD_LIMIT define in src/include/httpd.h.");
  +                     " HARD_THREAD_LIMIT define in %s.",
  +                     AP_MPM_HARD_LIMITS_FILE);
       }
       else if (threads_to_start < 1) {
   	ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
  
  
  
  1.34      +4 -2      apache-2.0/src/modules/mpm/mpmt_beos/mpmt_beos.c
  
  Index: mpmt_beos.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_beos/mpmt_beos.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- mpmt_beos.c	2000/06/14 00:17:21	1.33
  +++ mpmt_beos.c	2000/06/21 13:15:28	1.34
  @@ -1030,7 +1030,8 @@
                       " lowering MaxClients to %d.  To increase, please "
                       "see the", HARD_SERVER_LIMIT);
          ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
  -                    " HARD_SERVER_LIMIT define in src/include/httpd.h.");
  +                    " HARD_SERVER_LIMIT define in %s.",
  +                    AP_MPM_HARD_LIMITS_FILE);
          ap_daemons_limit = HARD_SERVER_LIMIT;
       } 
       else if (ap_daemons_limit < 1) {
  @@ -1058,7 +1059,8 @@
                        " lowering ThreadsPerChild to %d. To increase, please"
                        "see the", HARD_THREAD_LIMIT);
           ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
  -                     " HARD_THREAD_LIMIT define in src/include/httpd.h.");
  +                     " HARD_THREAD_LIMIT define in %s.",
  +                     AP_MPM_HARD_LIMITS_FILE);
       }
       else if (ap_threads_per_child < 1) {
   	ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
  
  
  
  1.92      +5 -3      apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c
  
  Index: mpmt_pthread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
  retrieving revision 1.91
  retrieving revision 1.92
  diff -u -r1.91 -r1.92
  --- mpmt_pthread.c	2000/06/20 19:16:16	1.91
  +++ mpmt_pthread.c	2000/06/21 13:15:28	1.92
  @@ -1391,7 +1391,8 @@
                       " lowering MaxClients to %d.  To increase, please "
                       "see the", HARD_SERVER_LIMIT);
          ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
  -                    " HARD_SERVER_LIMIT define in src/include/httpd.h.");
  +                    " HARD_SERVER_LIMIT define in %s.",
  +                    AP_MPM_HARD_LIMITS_FILE);
          ap_daemons_limit = HARD_SERVER_LIMIT;
       } 
       else if (ap_daemons_limit < 1) {
  @@ -1417,9 +1418,10 @@
                        HARD_THREAD_LIMIT);
           ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
                        " lowering ThreadsPerChild to %d. To increase, please"
  -                     "see the", HARD_THREAD_LIMIT);
  +                     " see the", HARD_THREAD_LIMIT);
           ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
  -                     " HARD_THREAD_LIMIT define in src/include/httpd.h.");
  +                     " HARD_THREAD_LIMIT define in %s.",
  +                     AP_MPM_HARD_LIMITS_FILE);
       }
       else if (ap_threads_per_child < 1) {
   	ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
  
  
  
  1.104     +2 -1      apache-2.0/src/modules/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
  retrieving revision 1.103
  retrieving revision 1.104
  diff -u -r1.103 -r1.104
  --- prefork.c	2000/06/20 19:16:16	1.103
  +++ prefork.c	2000/06/21 13:15:29	1.104
  @@ -1728,7 +1728,8 @@
                       " lowering MaxClients to %d.  To increase, please "
                       "see the", HARD_SERVER_LIMIT);
          ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
  -                    " HARD_SERVER_LIMIT define in src/include/httpd.h.");
  +                    " HARD_SERVER_LIMIT define in %s.",
  +                    AP_MPM_HARD_LIMITS_FILE);
          ap_daemons_limit = HARD_SERVER_LIMIT;
       } 
       else if (ap_daemons_limit < 1) {
  
  
  
  1.45      +2 -1      apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c
  
  Index: spmt_os2.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- spmt_os2.c	2000/06/12 18:07:40	1.44
  +++ spmt_os2.c	2000/06/21 13:15:30	1.45
  @@ -1575,7 +1575,8 @@
                       " lowering MaxClients to %d.  To increase, please "
                       "see the", HARD_SERVER_LIMIT);
          ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
  -                    " HARD_SERVER_LIMIT define in src/include/httpd.h.");
  +                    " HARD_SERVER_LIMIT define in %s.",
  +                    AP_MPM_HARD_LIMITS_FILE);
          ap_daemons_limit = HARD_SERVER_LIMIT;
       } 
       else if (ap_daemons_limit < 1) {
  
  
  
  1.80      +2 -2      apache-2.0/src/modules/mpm/winnt/mpm_winnt.c
  
  Index: mpm_winnt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/mpm_winnt.c,v
  retrieving revision 1.79
  retrieving revision 1.80
  diff -u -r1.79 -r1.80
  --- mpm_winnt.c	2000/06/19 17:49:58	1.79
  +++ mpm_winnt.c	2000/06/21 13:15:30	1.80
  @@ -2209,8 +2209,8 @@
                        HARD_THREAD_LIMIT);
           ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
                        " lowering ThreadsPerChild to %d. To increase, please"
  -                     " see the  HARD_THREAD_LIMIT define in src/include/httpd.h.", 
  -                     HARD_THREAD_LIMIT);
  +                     " see the  HARD_THREAD_LIMIT define in %s.", 
  +                     HARD_THREAD_LIMIT, AP_MPM_HARD_LIMITS_FILE);
       }
       else if (ap_threads_per_child < 1) {
   	ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
  
  
  

Mime
View raw message