You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by dr...@apache.org on 2001/02/13 19:08:50 UTC
cvs commit: httpd-2.0/server/mpm/beos mpm.h mpm_default.h
dreid 01/02/13 10:08:49
Modified: server/mpm/beos mpm.h mpm_default.h
Log:
OK, this is the start of getting things running on BeOS again :)
Revision Changes Path
1.4 +2 -11 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mpm.h 2000/07/30 12:03:46 1.3
+++ mpm.h 2001/02/13 18:08:47 1.4
@@ -63,23 +63,14 @@
#define MPM_NEEDS_RECLAIM_CHILD_PROCESSES 1
#define MPM_SYNC_CHILD_TABLE()
-#define MPM_CHILD_PID(i) (ap_child_table[i].pid)
+#define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid)
#define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0)
extern int ap_max_child_assigned;
#include "scoreboard.h"
-#define SERVER_DEAD 0
-#define SERVER_DYING 1
-#define SERVER_ALIVE 2
-
-typedef struct ap_ctable{
- pid_t pid;
- unsigned char status;
-} ap_ctable;
-
-extern ap_ctable ap_child_table[HARD_SERVER_LIMIT];
extern server_rec *ap_server_conf;
extern char ap_coredump_dir[MAX_STRING_LEN];
+extern int ap_threads_per_child;
#endif /* APACHE_MPM_BEOS_H */
1.2 +10 -0 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mpm_default.h 2000/06/20 14:30:01 1.1
+++ mpm_default.h 2001/02/13 18:08:48 1.2
@@ -59,6 +59,10 @@
#ifndef APACHE_MPM_DEFAULT_H
#define APACHE_MPM_DEFAULT_H
+
+#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
* this free when the caretaker checks, it will spawn more.
*/
@@ -117,6 +121,7 @@
#ifdef NO_THREADS
#define DEFAULT_THREADS_PER_CHILD 1
#endif
+
#ifndef DEFAULT_THREADS_PER_CHILD
#define DEFAULT_THREADS_PER_CHILD 10
#endif
@@ -124,6 +129,11 @@
/* Where the main/parent process's pid is logged */
#ifndef DEFAULT_PIDLOG
#define DEFAULT_PIDLOG "logs/httpd.pid"
+#endif
+
+/* Scoreboard file, if there is one */
+#ifndef DEFAULT_SCOREBOARD
+#define DEFAULT_SCOREBOARD "logs/apache_runtime_status"
#endif
/*