httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/mpm/prefork prefork.c
Date Fri, 10 Nov 2000 21:51:11 GMT
rbb         00/11/10 13:51:10

  Modified:    src/modules/mpm/dexter scoreboard.c
               src/modules/mpm/mpmt_pthread scoreboard.c
               src/modules/mpm/perchild scoreboard.c
               src/modules/mpm/prefork prefork.c
  Log:
  MM has a bug that when you ask for a specific amount of shared memory
  it allocates just that amount.  But, MM actually uses some of it, so we
  need to over allocate just a bit.  On 32 bit machines 40 bytes is enough,
  but on a 64 bit machine it isn't.  So, we bump it up to 80 bytes until
  MM fixes this bug.
  Submitted by:	David Hill <David.D.Hill@compaq.com>
  
  Revision  Changes    Path
  1.22      +1 -1      apache-2.0/src/modules/mpm/dexter/scoreboard.c
  
  Index: scoreboard.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/scoreboard.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- scoreboard.c	2000/08/02 05:27:04	1.21
  +++ scoreboard.c	2000/11/10 21:51:08	1.22
  @@ -102,7 +102,7 @@
       const char *fname;
   
       fname = ap_server_root_relative(p, ap_scoreboard_fname);
  -    if (apr_shm_init(&scoreboard_shm, SCOREBOARD_SIZE + 40, fname, p) != APR_SUCCESS)
{
  +    if (apr_shm_init(&scoreboard_shm, SCOREBOARD_SIZE + 80, fname, p) != APR_SUCCESS)
{
           apr_snprintf(buf, sizeof(buf), "%s: could not open(create) scoreboard",
                       ap_server_argv0);
           perror(buf);
  
  
  
  1.42      +1 -1      apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.c
  
  Index: scoreboard.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.c,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- scoreboard.c	2000/11/09 00:36:57	1.41
  +++ scoreboard.c	2000/11/10 21:51:09	1.42
  @@ -105,7 +105,7 @@
       const char *fname;
   
       fname = ap_server_root_relative(p, ap_scoreboard_fname);
  -    if (apr_shm_init(&scoreboard_shm, SCOREBOARD_SIZE + NEW_SCOREBOARD_SIZE + 40, fname,
p) != APR_SUCCESS) {
  +    if (apr_shm_init(&scoreboard_shm, SCOREBOARD_SIZE + NEW_SCOREBOARD_SIZE + 80, fname,
p) != APR_SUCCESS) {
           apr_snprintf(buf, sizeof(buf), "%s: could not open(create) scoreboard",
                       ap_server_argv0);
           perror(buf);
  
  
  
  1.4       +1 -1      apache-2.0/src/modules/mpm/perchild/scoreboard.c
  
  Index: scoreboard.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/perchild/scoreboard.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- scoreboard.c	2000/08/02 05:27:07	1.3
  +++ scoreboard.c	2000/11/10 21:51:10	1.4
  @@ -102,7 +102,7 @@
       const char *fname;
   
       fname = ap_server_root_relative(p, ap_scoreboard_fname);
  -    if (apr_shm_init(&scoreboard_shm, SCOREBOARD_SIZE + 40, fname, p) != APR_SUCCESS)
{
  +    if (apr_shm_init(&scoreboard_shm, SCOREBOARD_SIZE + 80, fname, p) != APR_SUCCESS)
{
           apr_snprintf(buf, sizeof(buf), "%s: could not open(create) scoreboard",
                       ap_server_argv0);
           perror(buf);
  
  
  
  1.135     +1 -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.134
  retrieving revision 1.135
  diff -u -r1.134 -r1.135
  --- prefork.c	2000/11/09 00:37:03	1.134
  +++ prefork.c	2000/11/10 21:51:10	1.135
  @@ -323,7 +323,7 @@
       const char *fname;
   
       fname = ap_server_root_relative(p, ap_scoreboard_fname);
  -    if (apr_shm_init(&scoreboard_shm, SCOREBOARD_SIZE + NEW_SCOREBOARD_SIZE + 40, fname,
p) != APR_SUCCESS) {
  +    if (apr_shm_init(&scoreboard_shm, SCOREBOARD_SIZE + NEW_SCOREBOARD_SIZE + 80, fname,
p) != APR_SUCCESS) {
   	apr_snprintf(buf, sizeof(buf), "%s: could not open(create) scoreboard",
   		    ap_server_argv0);
   	perror(buf);
  
  
  

Mime
View raw message