Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 13 Feb 2001 20:46:49 -0000
Message-ID: <20010213204649.16190.qmail@apache.org>
From: dreid@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/server/mpm/beos mpm.h mpm_default.h

dreid       01/02/13 12:46:49

  Modified:    server/mpm/beos mpm.h mpm_default.h
  Log:
  More changes to the way that we use mod_status on beos.
  
  Revision  Changes    Path
  1.5       +2 -2      httpd-2.0/server/mpm/beos/mpm.h
  
  Index: mpm.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/beos/mpm.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mpm.h	2001/02/13 18:08:47	1.4
  +++ mpm.h	2001/02/13 20:46:48	1.5
  @@ -60,14 +60,14 @@
   #define APACHE_MPM_BEOS_H
   
   #define BEOS_MPM
  +#include "scoreboard.h"
   
   #define MPM_NEEDS_RECLAIM_CHILD_PROCESSES 1
   #define MPM_SYNC_CHILD_TABLE()
  -#define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid)
  +#define MPM_CHILD_PID(i) (ap_scoreboard_image->servers[0][i].tid)
   #define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0)
   
   extern int ap_max_child_assigned;
  -#include "scoreboard.h"
   
   extern server_rec *ap_server_conf;
   extern char ap_coredump_dir[MAX_STRING_LEN];
  
  
  
  1.3       +16 -20    httpd-2.0/server/mpm/beos/mpm_default.h
  
  Index: mpm_default.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/beos/mpm_default.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mpm_default.h	2001/02/13 18:08:48	1.2
  +++ mpm_default.h	2001/02/13 20:46:48	1.3
  @@ -59,30 +59,30 @@
   #ifndef APACHE_MPM_DEFAULT_H
   #define APACHE_MPM_DEFAULT_H
   
  +/* we use the child (c) as zero in our code... */
  +#define AP_ID_FROM_CHILD_THREAD(c, t)     t
  +/* as the child is always zero, just return the id... */
  +#define AP_CHILD_THREAD_FROM_ID(i)        0 , i
   
  -#define AP_ID_FROM_CHILD_THREAD(c, t)    ((c * HARD_THREAD_LIMIT) + t)
  -#define AP_CHILD_THREAD_FROM_ID(i)       (0),(i)
  -
  -/* 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_THREADS
  +#define DEFAULT_START_THREADS 25
   #endif
  -#define DEFAULT_START_THREADS 20
   
  -/* Maximum number of *free* server processes --- more than this, and
  +/* Maximum number of *free* threads --- more than this, and
    * they will die off.
    */
   
  -#ifndef DEFAULT_MAX_FREE_DAEMON
  -#define DEFAULT_MAX_FREE_DAEMON 10
  +#ifndef DEFAULT_MAX_FREE_THREADS
  +#define DEFAULT_MAX_FREE_THREADS 50
   #endif
   
   /* Minimum --- fewer than this, and more will be created */
   
  -#ifndef DEFAULT_MIN_FREE_DAEMON
  -#define DEFAULT_MIN_FREE_DAEMON 5
  +#ifndef DEFAULT_MIN_FREE_THREADS
  +#define DEFAULT_MIN_FREE_THREADS 5
   #endif
   
   /* Limit on the total --- clients will be locked out if more servers than
  @@ -96,13 +96,9 @@
    * enough that we can read the whole thing without worrying too much about
    * the overhead.
    */
  - 
  -#ifdef NO_THREADS
  -#define HARD_SERVER_LIMIT 256
  -#endif
  -#ifndef HARD_SERVER_LIMIT
  -#define HARD_SERVER_LIMIT 64 
  -#endif
  +
  +/* we only ever have 1 main process running... */ 
  +#define HARD_SERVER_LIMIT 1
   
   /* Limit on the threads per process.  Clients will be locked out if more than
    * this  * HARD_SERVER_LIMIT are needed.
  @@ -115,7 +111,7 @@
   #define HARD_THREAD_LIMIT 1
   #endif
   #ifndef HARD_THREAD_LIMIT
  -#define HARD_THREAD_LIMIT 64 
  +#define HARD_THREAD_LIMIT 50 
   #endif
   
   #ifdef NO_THREADS